diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:17 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:17 -0600 |
| commit | 7eeec8642b84086fcff550f1d1d8f24a55ad5fc3 (patch) | |
| tree | 8d39929f951abf663a1ac81f1c40cd85bfd1c413 /include | |
| parent | 40b728a43e3aba1a810ea3a8332e90a606e99807 (diff) | |
Backport to 2.6.22.6 of MMC/SD/SDIO updates in 2.6.23-rc3
Backport of MMC/SD/SDIO updates from the linux 2.6.23-rc3 kernel to the
2.6.22.6 kernel. This patch created from mmc diffs between linus git
2.6.22 and 2.6.23-rc3. Sources are available from kernel.org.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-Backport-to-2.6.22.6-of-MMC-SD-SDIO-update.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/core.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 04bbe12fae8d..63a80ea61124 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -99,7 +99,7 @@ struct mmc_request { struct mmc_host; struct mmc_card; -extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *); +extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *); extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int); extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *, struct mmc_command *, int); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c1ffa1b2189c..53b750f57a29 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2003,6 +2003,9 @@ #define PCI_VENDOR_ID_ENE 0x1524 #define PCI_DEVICE_ID_ENE_CB712_SD 0x0550 +#define PCI_DEVICE_ID_ENE_CB712_SD_2 0x0551 +#define PCI_DEVICE_ID_ENE_CB714_SD 0x0750 +#define PCI_DEVICE_ID_ENE_CB714_SD_2 0x0751 #define PCI_DEVICE_ID_ENE_1211 0x1211 #define PCI_DEVICE_ID_ENE_1225 0x1225 #define PCI_DEVICE_ID_ENE_1410 0x1410 |