diff options
Diffstat (limited to 'xen-2.4.16/drivers/pci/names.c')
| -rw-r--r-- | xen-2.4.16/drivers/pci/names.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xen-2.4.16/drivers/pci/names.c b/xen-2.4.16/drivers/pci/names.c index 90bb37e382..80674543b0 100644 --- a/xen-2.4.16/drivers/pci/names.c +++ b/xen-2.4.16/drivers/pci/names.c @@ -7,7 +7,7 @@ #include <linux/config.h> #include <linux/types.h> -//#include <linux/kernel.h> +/*#include <linux/kernel.h>*/ #include <linux/pci.h> #include <linux/init.h> @@ -32,18 +32,18 @@ struct pci_vendor_info { * real memory.. Parse the same file multiple times * to get all the info. */ -#define VENDOR( vendor, name ) static char __vendorstr_##vendor[] __initdata = name; +#define VENDOR( vendor, name ) static char __vendorstr_##vendor[] __devinitdata = name; #define ENDVENDOR() -#define DEVICE( vendor, device, name ) static char __devicestr_##vendor##device[] __initdata = name; +#define DEVICE( vendor, device, name ) static char __devicestr_##vendor##device[] __devinitdata = name; #include "devlist.h" -#define VENDOR( vendor, name ) static struct pci_device_info __devices_##vendor[] __initdata = { +#define VENDOR( vendor, name ) static struct pci_device_info __devices_##vendor[] __devinitdata = { #define ENDVENDOR() }; #define DEVICE( vendor, device, name ) { 0x##device, 0, __devicestr_##vendor##device }, #include "devlist.h" -static struct pci_vendor_info __initdata pci_vendor_list[] = { +static struct pci_vendor_info __devinitdata pci_vendor_list[] = { #define VENDOR( vendor, name ) { 0x##vendor, sizeof(__devices_##vendor) / sizeof(struct pci_device_info), __vendorstr_##vendor, __devices_##vendor }, #define ENDVENDOR() #define DEVICE( vendor, device, name ) @@ -121,7 +121,7 @@ pci_class_name(u32 class) #else -void __init pci_name_device(struct pci_dev *dev) +void __devinit pci_name_device(struct pci_dev *dev) { } |