net:wireless:bcmdhd: Add BCM4330 chip ID
Mursalin Akon [Thu, 15 Mar 2012 22:22:16 +0000 (15:22 -0700)]
Add ID of BCM4330 to supported chips.
Remove ID of BCM4329 as it is not supported.

Bug 956238

Change-Id: I5c9e809245161d76c3decab3e5252ce111a2a07d
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/90657
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>

drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c

index ef48d1f..1a37086 100644 (file)
 #if !defined(SDIO_DEVICE_ID_BROADCOM_4325)
 #define SDIO_DEVICE_ID_BROADCOM_4325   0x0493
 #endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4325) */
-#if !defined(SDIO_DEVICE_ID_BROADCOM_4329)
-#define SDIO_DEVICE_ID_BROADCOM_4329   0x4329
-#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4329) */
 #if !defined(SDIO_DEVICE_ID_BROADCOM_4319)
 #define SDIO_DEVICE_ID_BROADCOM_4319   0x4319
 #endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4319) */
+#if !defined(SDIO_DEVICE_ID_BROADCOM_4330)
+#define SDIO_DEVICE_ID_BROADCOM_4330   0x4330
+#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4330) */
 
 #include <bcmsdh_sdmmc.h>
 
@@ -151,9 +151,8 @@ static const struct sdio_device_id bcmsdh_sdmmc_ids[] = {
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_DEFAULT) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4325_SDGWB) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4325) },
-       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4319) },
-       { SDIO_DEVICE_CLASS(SDIO_CLASS_NONE)            },
+       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330) },
        { /* end: all zeroes */                         },
 };