diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 9 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 0bea391871ae..d2125b2059b6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -23,14 +23,17 @@ #ifndef _DEVICE_H_ #define _DEVICE_H_ -#include <linux/types.h> #include <linux/config.h> #include <linux/ioport.h> +#include <linux/kobject.h> #include <linux/list.h> #include <linux/sched.h> -#include <linux/kobject.h> +#include <linux/spinlock.h> +#include <linux/types.h> +#include <asm/atomic.h> -#define DEVICE_NAME_SIZE 80 +#define DEVICE_NAME_SIZE 50 +#define DEVICE_NAME_HALF __stringify(20) /* Less than half to accommodate slop */ #define DEVICE_ID_SIZE 32 #define BUS_ID_SIZE 16 diff --git a/include/linux/pci.h b/include/linux/pci.h index 1861ec80c66c..7206acd7870b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -371,7 +371,6 @@ struct pci_dev { struct resource dma_resource[DEVICE_COUNT_DMA]; struct resource irq_resource[DEVICE_COUNT_IRQ]; - char name[90]; /* device name */ char slot_name[8]; /* slot name */ int active; /* ISAPnP: device is active */ int ro; /* ISAPnP: read only */ |