git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpqphp_nvram.c
diff --git
a/drivers/pci/hotplug/cpqphp_nvram.c
b/drivers/pci/hotplug/cpqphp_nvram.c
index
ac98a11
..
ae5e974
100644
(file)
--- a/
drivers/pci/hotplug/cpqphp_nvram.c
+++ b/
drivers/pci/hotplug/cpqphp_nvram.c
@@
-26,7
+26,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-34,6
+33,7
@@
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include <linux/init.h>
#include <asm/uaccess.h>
#include "cpqphp.h"
#include <linux/init.h>
#include <asm/uaccess.h>
#include "cpqphp.h"
@@
-520,7
+520,7
@@
int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
return 2;
while (nummem--) {
return 2;
while (nummem--) {
- mem_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!mem_node)
break;
if (!mem_node)
break;
@@
-548,7
+548,7
@@
int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
}
while (numpmem--) {
}
while (numpmem--) {
- p_mem_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ p_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!p_mem_node)
break;
if (!p_mem_node)
break;
@@
-576,7
+576,7
@@
int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
}
while (numio--) {
}
while (numio--) {
- io_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ io_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!io_node)
break;
if (!io_node)
break;
@@
-604,7
+604,7
@@
int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
}
while (numbus--) {
}
while (numbus--) {
- bus_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ bus_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!bus_node)
break;
if (!bus_node)
break;