aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2009-07-22 10:06:56 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-26 22:25:47 -0400
commit51def0bea92629dff02ff1de40603eb90c609c55 (patch)
tree9c8f2192098c052704faca9b749247f7c7f80d84 /drivers/net/wimax
parent1896e61ff7cc1c9dd0d8b1cf4a9426a0f7217a20 (diff)
imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
1. add intel's sdio vendor id to sdio_ids.h 2. move iwmc3200 sdio devices' ids to sdio_ids.h Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r--drivers/net/wimax/i2400m/sdio.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index 2538825d1c66..ea7b29034aab 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -58,6 +58,7 @@
58 */ 58 */
59 59
60#include <linux/debugfs.h> 60#include <linux/debugfs.h>
61#include <linux/mmc/sdio_ids.h>
61#include <linux/mmc/sdio.h> 62#include <linux/mmc/sdio.h>
62#include <linux/mmc/sdio_func.h> 63#include <linux/mmc/sdio_func.h>
63#include "i2400m-sdio.h" 64#include "i2400m-sdio.h"
@@ -501,15 +502,12 @@ void i2400ms_remove(struct sdio_func *func)
501 d_fnend(3, dev, "SDIO func %p\n", func); 502 d_fnend(3, dev, "SDIO func %p\n", func);
502} 503}
503 504
504enum {
505 I2400MS_INTEL_VID = 0x89,
506};
507
508static 505static
509const struct sdio_device_id i2400ms_sdio_ids[] = { 506const struct sdio_device_id i2400ms_sdio_ids[] = {
510 /* Intel: i2400m WiMAX over SDIO */ 507 /* Intel: i2400m WiMAX (iwmc3200) over SDIO */
511 { SDIO_DEVICE(I2400MS_INTEL_VID, 0x1402) }, 508 { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
512 { }, /* end: all zeroes */ 509 SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },
510 { /* end: all zeroes */ },
513}; 511};
514MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids); 512MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);
515 513