diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-04-09 23:34:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-04-09 23:34:20 +0000 |
| commit | 095f5eb5fab8867dd9b68193b53e521c7ee8303e (patch) | |
| tree | ecb3e555bc98b06214ec12698ae7165b35360f6a /package/kernel | |
| parent | 1c0e72203a587592e15f16fd3be5a8dea30dcf0a (diff) | |
| download | upstream-095f5eb5fab8867dd9b68193b53e521c7ee8303e.tar.gz upstream-095f5eb5fab8867dd9b68193b53e521c7ee8303e.tar.bz2 upstream-095f5eb5fab8867dd9b68193b53e521c7ee8303e.zip | |
kernel: add symbols, small fixes
* Some module should be loaded later to load them after the modules they are depending on
* add some more missing config symbols
* make CS5535 build again
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26570 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 3 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 919e8ad19d..9f6e23ace8 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -296,6 +296,7 @@ $(eval $(call KernelPackage,ipt-led)) define KernelPackage/ipt-tproxy TITLE:=Transparent proxying support + DEPENDS+=+IPV6:kmod-ipv6 KCONFIG:= \ CONFIG_NETFILTER_TPROXY \ CONFIG_NETFILTER_XT_MATCH_SOCKET \ @@ -303,7 +304,7 @@ define KernelPackage/ipt-tproxy FILES:= \ $(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko \ $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) - AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tproxy_core $(IPT_TPROXY-m))) + AUTOLOAD:=$(call AutoLoad,50,$(notdir nf_tproxy_core $(IPT_TPROXY-m))) $(call AddDepends/ipt) endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 8c03efcaf3..d05c1c6f08 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -182,8 +182,8 @@ $(eval $(call KernelPackage,eeprom-93cx6)) define KernelPackage/gpio-cs5535 SUBMENU:=$(OTHER_MENU) TITLE:=AMD CS5535/CS5536 GPIO driver - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_CS5535_GPIO + DEPENDS:=@TARGET_x86 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 + KCONFIG:=CONFIG_CS5535_GPIO CONFIG_GPIOLIB=y FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio) endef @@ -198,12 +198,10 @@ $(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 -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) - KCONFIG:=CONFIG_GPIO_CS5535 CONFIG_PCI CONFIG_GPIOLIB + DEPENDS:=@TARGET_x86 @!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32) + KCONFIG:=CONFIG_GPIO_CS5535 CONFIG_GPIOLIB=y FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio) -endif endef define KernelPackage/gpio-cs5535-new/description @@ -925,7 +923,7 @@ define KernelPackage/rtc-pcf8563 DEPENDS:=+kmod-rtc-core KCONFIG:=CONFIG_RTC_DRV_PCF8563 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,rtc-pcf8563) + AUTOLOAD:=$(call AutoLoad,60,rtc-pcf8563) endef define KernelPackage/rtc-pcf8563/description |