mmc: sdio: Move SDIO IDs from btmrvl driver to common include file

[linux-2.6-microblaze.git] / drivers / bluetooth / btmrvl_sdio.c

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0f3a020..a296f85 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -355,31 +355,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = {
 
 static const struct sdio_device_id btmrvl_sdio_ids[] = {
        /* Marvell SD8688 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8688_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8688 },
        /* Marvell SD8787 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },
        /* Marvell SD8787 Bluetooth AMP device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT_AMP),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },
        /* Marvell SD8797 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8797 },
        /* Marvell SD8887 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9136),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8887 },
        /* Marvell SD8897 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8897 },
        /* Marvell SD8977 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8977 },
        /* Marvell SD8987 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8987 },
        /* Marvell SD8997 Bluetooth device */
-       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),
+       { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_BT),
                        .driver_data = (unsigned long)&btmrvl_sdio_sd8997 },
 
        { }     /* Terminating entry */