diff options
Diffstat (limited to 'drivers/staging/gdm72xx')
-rw-r--r-- | drivers/staging/gdm72xx/Kconfig | 10 | ||||
-rw-r--r-- | drivers/staging/gdm72xx/gdm_wimax.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/gdm72xx/Kconfig b/drivers/staging/gdm72xx/Kconfig index 6905913..dd8a391 100644 --- a/drivers/staging/gdm72xx/Kconfig +++ b/drivers/staging/gdm72xx/Kconfig @@ -4,7 +4,7 @@ menuconfig WIMAX_GDM72XX tristate "GCT GDM72xx WiMAX support" - depends on NET + depends on NET && (USB || MMC) help Support for the GCT GDM72xx WiMAX chip @@ -19,7 +19,7 @@ config WIMAX_GDM72XX_K_MODE default n config WIMAX_GDM72XX_WIMAX2 - bool "Enable WIMAX2 support" + bool "Enable WiMAX2 support" default n choice @@ -27,18 +27,18 @@ choice config WIMAX_GDM72XX_USB bool "USB interface" - depends on USB + depends on (USB = y || USB = WIMAX_GDM72XX) config WIMAX_GDM72XX_SDIO bool "SDIO interface" - depends on MMC + depends on (MMC = y || MMC = WIMAX_GDM72XX) endchoice if WIMAX_GDM72XX_USB config WIMAX_GDM72XX_USB_PM - bool "Enable power managerment support" + bool "Enable power management support" depends on PM_RUNTIME endif # WIMAX_GDM72XX_USB diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 41efbee..dd85497 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -939,8 +939,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev) struct net_device *dev; int ret; - dev = (struct net_device *)alloc_netdev(sizeof(*nic), - "wm%d", ether_setup); + dev = alloc_netdev(sizeof(*nic), "wm%d", ether_setup); if (dev == NULL) { pr_err("alloc_etherdev failed\n"); |