diff options
Diffstat (limited to 'drivers/eisa')
-rw-r--r-- | drivers/eisa/Makefile | 2 | ||||
-rw-r--r-- | drivers/eisa/eisa-bus.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/eisa/Makefile b/drivers/eisa/Makefile index 70abf93fe6b0..5369ce957c6d 100644 --- a/drivers/eisa/Makefile +++ b/drivers/eisa/Makefile | |||
@@ -9,7 +9,7 @@ obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o | |||
9 | 9 | ||
10 | 10 | ||
11 | # Ugly hack to get DEVICE_NAME_SIZE value... | 11 | # Ugly hack to get DEVICE_NAME_SIZE value... |
12 | DEVICE_NAME_SIZE =$(shell awk '$$1=="\#define" && $$2=="DEVICE_NAME_SIZE" {print $$3-1}' $(srctree)/include/linux/device.h) | 12 | DEVICE_NAME_SIZE = 50 |
13 | 13 | ||
14 | $(obj)/eisa-bus.o: $(obj)/devlist.h | 14 | $(obj)/eisa-bus.o: $(obj)/devlist.h |
15 | 15 | ||
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 65dcf0432653..c950bf8606d9 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | struct eisa_device_info { | 23 | struct eisa_device_info { |
24 | struct eisa_device_id id; | 24 | struct eisa_device_id id; |
25 | char name[DEVICE_NAME_SIZE]; | 25 | char name[50]; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | #ifdef CONFIG_EISA_NAMES | 28 | #ifdef CONFIG_EISA_NAMES |
@@ -63,7 +63,7 @@ static void __init eisa_name_device (struct eisa_device *edev) | |||
63 | if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) { | 63 | if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) { |
64 | strlcpy (edev->pretty_name, | 64 | strlcpy (edev->pretty_name, |
65 | eisa_table[i].name, | 65 | eisa_table[i].name, |
66 | DEVICE_NAME_SIZE); | 66 | sizeof(edev->pretty_name)); |
67 | return; | 67 | return; |
68 | } | 68 | } |
69 | } | 69 | } |