diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2009-11-14 09:36:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-16 07:08:31 +0100 |
| commit | 11e2521701681452f54f0e98ee2041da07d24c70 (patch) | |
| tree | 96fec6999e8c240e6ff0e83b4374b85bb3815137 /drivers/misc | |
| parent | net: check the return value of ndo_select_queue() (diff) | |
| download | linux-11e2521701681452f54f0e98ee2041da07d24c70.tar.xz linux-11e2521701681452f54f0e98ee2041da07d24c70.zip | |
iwmc3200top: use prefered style for the device table.
Use device id number directly accompany with
comment rather then a #define
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/iwmc3200top/main.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c index 6e4e49113ab4..a1ce97ef0bed 100644 --- a/drivers/misc/iwmc3200top/main.c +++ b/drivers/misc/iwmc3200top/main.c @@ -62,15 +62,6 @@ MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL"); MODULE_AUTHOR(DRIVER_COPYRIGHT); - -/* FIXME: These can be found in sdio_ids.h in newer kernels */ -#ifndef SDIO_INTEL_VENDOR_ID -#define SDIO_INTEL_VENDOR_ID 0x0089 -#endif -#ifndef SDIO_DEVICE_ID_INTEL_IWMC3200TOP -#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404 -#endif - /* * This workers main task is to wait for OP_OPR_ALIVE * from TOP FW until ALIVE_MSG_TIMOUT timeout is elapsed. @@ -662,8 +653,9 @@ static void iwmct_remove(struct sdio_func *func) static const struct sdio_device_id iwmct_ids[] = { - { SDIO_DEVICE(SDIO_INTEL_VENDOR_ID, SDIO_DEVICE_ID_INTEL_IWMC3200TOP)}, - { /* end: all zeroes */ }, + /* Intel Wireless MultiCom 3200 Top Driver */ + { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 0x1404)}, + { }, /* Terminating entry */ }; MODULE_DEVICE_TABLE(sdio, iwmct_ids); |