diff options
author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-07-03 03:14:51 +0000 |
---|---|---|
committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-07-03 03:14:51 +0000 |
commit | 1e6c89025a255ad8fe4f8eccdc1a7a5d5fa0c12c (patch) | |
tree | 2e86ab071b8a669872a3198ca9bc7db760b84775 /package | |
parent | a661e5a1a8b9ab1d635d606b79348d7153a86366 (diff) | |
download | master-187ad058-1e6c89025a255ad8fe4f8eccdc1a7a5d5fa0c12c.tar.gz master-187ad058-1e6c89025a255ad8fe4f8eccdc1a7a5d5fa0c12c.tar.bz2 master-187ad058-1e6c89025a255ad8fe4f8eccdc1a7a5d5fa0c12c.zip |
[x86] Revert "Like the earlier mfgpt patch, the new GPIO drivers also require the MFD driver to be present for the BAR's to be mapped."
This reverts commit c485487b63d1c1de72a375f1278d8a98546ba3af.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27370 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r-- | package/kernel/modules/other.mk | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 2de923f952..2b6b86bfc1 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -127,7 +127,7 @@ $(eval $(call KernelPackage,gpio-cs5535)) define KernelPackage/gpio-cs5535-new SUBMENU:=$(OTHER_MENU) TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd @!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32) + DEPENDS:=@TARGET_x86 @!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32) KCONFIG:=CONFIG_GPIO_CS5535 FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio) @@ -552,7 +552,7 @@ $(eval $(call KernelPackage,cs5535-clockevt)) define KernelPackage/cs5535-mfgpt SUBMENU:=$(OTHER_MENU) TITLE:=CS5535/6 Multifunction General Purpose Timer - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd + DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_CS5535_MFGPT FILES:=$(LINUX_DIR)/drivers/misc/cs5535-mfgpt.ko AUTOLOAD:=$(call AutoLoad,45,cs5535-mfgpt) @@ -565,24 +565,6 @@ endef $(eval $(call KernelPackage,cs5535-mfgpt)) -define KernelPackage/cs5535-mfd - SUBMENU:=$(OTHER_MENU) - TITLE:=CS5535/6 Multifunction General Purpose Driver - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_MFD_CS5535 - FILES:= \ - $(LINUX_DIR)/drivers/mfd/mfd-core.ko \ - $(LINUX_DIR)/drivers/mfd/cs5535-mfd.ko - AUTOLOAD:=$(call AutoLoad,44,mfd-core cs5535-mfd) -endef - -define KernelPackage/cs5535-mfd/description - Core driver for CS5535/CS5536 MFD functions. -endef - -$(eval $(call KernelPackage,cs5535-mfd)) - - define KernelPackage/wdt-omap SUBMENU:=$(OTHER_MENU) TITLE:=OMAP Watchdog timer |