diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:30 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:30 +0200 |
commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /drivers/mfd/Makefile | |
parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) | |
download | op-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.zip op-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.tar.gz |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r-- | drivers/mfd/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index ef489f2..419caa9 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -6,7 +6,6 @@ obj-$(CONFIG_MFD_88PM860X) += 88pm860x.o obj-$(CONFIG_MFD_SM501) += sm501.o obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o -obj-$(CONFIG_MFD_SH_MOBILE_SDHI) += sh_mobile_sdhi.o obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o |