diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 14:57:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 14:57:52 -0700 |
commit | 4c75f7416f51b0c6855952467a5db04f9c598f09 (patch) | |
tree | dbe06f7e69d68cf99b20567577c9c5488e4e1e8c /drivers/mmc/core/Makefile | |
parent | 6ed911fb04886c5510a41cd89203b931b1c5d261 (diff) | |
parent | ed99c541e0a15281c57530d54a4a5e3272f74fb9 (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:
mmc: at91_mci: fix hanging and rework to match flowcharts
mmc: at91_mci typo
sdhci: Fix "Unexpected interrupt" handling
mmc: fix silly copy-and-paste error
mmc: move layer init and workqueue to core file
mmc: refactor host class handling
mmc: refactor bus operations
sdhci: add ene controller id
mmc: bounce requests for simple hosts
Diffstat (limited to 'drivers/mmc/core/Makefile')
-rw-r--r-- | drivers/mmc/core/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index 1075b02ae75..3fdd08c7f14 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile @@ -7,5 +7,6 @@ ifeq ($(CONFIG_MMC_DEBUG),y) endif obj-$(CONFIG_MMC) += mmc_core.o -mmc_core-y := core.o sysfs.o mmc.o mmc_ops.o sd.o sd_ops.o +mmc_core-y := core.o sysfs.o bus.o host.o \ + mmc.o mmc_ops.o sd.o sd_ops.o |