aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 17:00:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 17:00:56 -0400
commitd941cf5e373c356723fa648b9f0302a11c9b1770 (patch)
treef79c2cab0e6223e452cbb6599859eaeec4ba8188 /include
parent9f5577d8158d8190174d95cbf21713251cc8a044 (diff)
parent393618510d5349e07d71dc28fb6fc49baf0d96a0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: drivers/mmc/core/: make 3 functions static mmc: add missing printk levels mmc: remove redundant debug information from sdhci and wbsd mmc: proper debugging output in core mmc: be more verbose about card insertions/removal mmc: Don't hold lock when releasing an added card mmc: add a might_sleep() to mmc_claim_host() mmc: update kerneldoc mmc: update header file paths sdhci: add support to ENE-CB714 mmc: check error bits before command completion
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmc/core.h2
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 3 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 {
99struct mmc_host; 99struct mmc_host;
100struct mmc_card; 100struct mmc_card;
101 101
102extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *); 102extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
103extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int); 103extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
104extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *, 104extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
105 struct mmc_command *, int); 105 struct mmc_command *, int);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index dc41ad4203b8..69d68117bdac 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1976,6 +1976,8 @@
1976#define PCI_VENDOR_ID_ENE 0x1524 1976#define PCI_VENDOR_ID_ENE 0x1524
1977#define PCI_DEVICE_ID_ENE_CB712_SD 0x0550 1977#define PCI_DEVICE_ID_ENE_CB712_SD 0x0550
1978#define PCI_DEVICE_ID_ENE_CB712_SD_2 0x0551 1978#define PCI_DEVICE_ID_ENE_CB712_SD_2 0x0551
1979#define PCI_DEVICE_ID_ENE_CB714_SD 0x0750
1980#define PCI_DEVICE_ID_ENE_CB714_SD_2 0x0751
1979#define PCI_DEVICE_ID_ENE_1211 0x1211 1981#define PCI_DEVICE_ID_ENE_1211 0x1211
1980#define PCI_DEVICE_ID_ENE_1225 0x1225 1982#define PCI_DEVICE_ID_ENE_1225 0x1225
1981#define PCI_DEVICE_ID_ENE_1410 0x1410 1983#define PCI_DEVICE_ID_ENE_1410 0x1410