diff options
author | Michael Tokarev <mjt@tls.mks.ru> | 2006-09-27 04:50:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:19 -0400 |
commit | 07563c711fbc25389e58ab9c9f0b9de2fce56760 (patch) | |
tree | aadbe41b9303c636a2c44169680613b8b56d5006 /drivers/net | |
parent | ebba5f9fcb882306bef7175dee987342ec6fcf2f (diff) |
[PATCH] EISA bus MODALIAS attributes support
Add modalias attribute support for the almost forgotten now EISA bus and
(at least some) EISA-aware modules.
The modalias entry looks like (for an 3c509 NIC):
eisa:sTCM5093
and the in-module alias like:
eisa:sTCM5093*
The patch moves struct eisa_device_id declaration from include/linux/eisa.h
to include/linux/mod_devicetable.h (so that the former now #includes the
latter), adds proper MODULE_DEVICE_TABLE(eisa, ...) statements for all
drivers with EISA IDs I found (some drivers already have that DEVICE_TABLE
declared), and adds recognision of __mod_eisa_device_table to
scripts/mod/file2alias.c so that proper modules.alias will be generated.
There's no support for /lib/modules/$kver/modules.eisamap, as it's not used
by any existing tools, and because with in-kernel modalias mechanism those
maps are obsolete anyway.
The rationale for this patch is:
a) to make EISA bus to act as other busses with modalias
support, to unify driver loading
b) to foget about EISA finally - with this patch, kernel
(who still supports EISA) will be the only one who knows
how to choose the necessary drivers for this bus ;)
[akpm@osdl.org: fix the kbuild bit]
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Acked-the-net-bits-by: Jeff Garzik <jeff@garzik.org>
Acked-the-tulip-bit-by: Valerie Henson <val_henson@linux.intel.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c509.c | 1 | ||||
-rw-r--r-- | drivers/net/3c59x.c | 1 | ||||
-rw-r--r-- | drivers/net/ne3210.c | 1 | ||||
-rw-r--r-- | drivers/net/tulip/de4x5.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 59c33925be62..b936373ab2a5 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -225,6 +225,7 @@ static struct eisa_device_id el3_eisa_ids[] = { | |||
225 | { "TCM5095" }, | 225 | { "TCM5095" }, |
226 | { "" } | 226 | { "" } |
227 | }; | 227 | }; |
228 | MODULE_DEVICE_TABLE(eisa, el3_eisa_ids); | ||
228 | 229 | ||
229 | static int el3_eisa_probe (struct device *device); | 230 | static int el3_eisa_probe (struct device *device); |
230 | 231 | ||
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index af301f09d674..df42e28cc80f 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -851,6 +851,7 @@ static struct eisa_device_id vortex_eisa_ids[] = { | |||
851 | { "TCM5970", CH_3C597 }, | 851 | { "TCM5970", CH_3C597 }, |
852 | { "" } | 852 | { "" } |
853 | }; | 853 | }; |
854 | MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids); | ||
854 | 855 | ||
855 | static int vortex_eisa_probe(struct device *device); | 856 | static int vortex_eisa_probe(struct device *device); |
856 | static int vortex_eisa_remove(struct device *device); | 857 | static int vortex_eisa_remove(struct device *device); |
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index 0fa8e4d22769..d66328975425 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c | |||
@@ -343,6 +343,7 @@ static struct eisa_device_id ne3210_ids[] = { | |||
343 | { "NVL1801" }, | 343 | { "NVL1801" }, |
344 | { "" }, | 344 | { "" }, |
345 | }; | 345 | }; |
346 | MODULE_DEVICE_TABLE(eisa, ne3210_ids); | ||
346 | 347 | ||
347 | static struct eisa_driver ne3210_eisa_driver = { | 348 | static struct eisa_driver ne3210_eisa_driver = { |
348 | .id_table = ne3210_ids, | 349 | .id_table = ne3210_ids, |
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index e661d0a9cc64..fb5fa7d68888 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -2114,6 +2114,7 @@ static struct eisa_device_id de4x5_eisa_ids[] = { | |||
2114 | { "DEC4250", 0 }, /* 0 is the board name index... */ | 2114 | { "DEC4250", 0 }, /* 0 is the board name index... */ |
2115 | { "" } | 2115 | { "" } |
2116 | }; | 2116 | }; |
2117 | MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); | ||
2117 | 2118 | ||
2118 | static struct eisa_driver de4x5_eisa_driver = { | 2119 | static struct eisa_driver de4x5_eisa_driver = { |
2119 | .id_table = de4x5_eisa_ids, | 2120 | .id_table = de4x5_eisa_ids, |