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

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 919e8ad..9f6e23a 100644 (file)
--- 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 8c03efc..d05c1c6 100644 (file)
--- 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

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index beb9e8b..5f1863c 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -562,7 +562,7 @@ define KernelPackage/libertas-sd
   FILES:= \
        $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \
        $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko
-  AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio)
+  AUTOLOAD:=$(call AutoLoad,91,libertas libertas_sdio)
 endef
 
 define KernelPackage/mac80211-hwsim

diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30
index 8d01b32..2b4a87b 100644 (file)
--- a/target/linux/generic/config-2.6.30
+++ b/target/linux/generic/config-2.6.30
@@ -1200,6 +1200,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set

diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index 6757cf0..e81a4d7 100644 (file)
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -1196,6 +1196,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set

diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32
index e5723b8..09c9d04 100644 (file)
--- a/target/linux/generic/config-2.6.32
+++ b/target/linux/generic/config-2.6.32
@@ -1275,6 +1275,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set

diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35
index 4d9fb82..358b523 100644 (file)
--- a/target/linux/generic/config-2.6.35
+++ b/target/linux/generic/config-2.6.35
@@ -1414,6 +1414,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set

diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index b2c09bb..8f526ff 100644 (file)
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -1311,6 +1311,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
@@ -2292,6 +2293,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_INTERWAVE is not set
 # CONFIG_SND_INTERWAVE_STB is not set
 # CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set

diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index e9fb263..8719e52 100644 (file)
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -1347,6 +1347,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
@@ -2347,6 +2348,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_INTERWAVE is not set
 # CONFIG_SND_INTERWAVE_STB is not set
 # CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set

diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38
index 55aae4a..6c1fb03 100644 (file)
--- a/target/linux/generic/config-2.6.38
+++ b/target/linux/generic/config-2.6.38
@@ -169,6 +169,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
@@ -348,6 +349,7 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
 # CONFIG_CGROUPS is not set
+# CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHELSIO_T4 is not set
@@ -398,6 +400,7 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_AEAD is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
 # CONFIG_CRYPTO_ALGAPI is not set
 # CONFIG_CRYPTO_ALGAPI2 is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
@@ -505,6 +508,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1370,6 +1374,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
@@ -1723,6 +1728,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 # CONFIG_N_GSM is not set
@@ -2250,6 +2256,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX3107 is not set
@@ -2375,6 +2382,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_INTERWAVE is not set
 # CONFIG_SND_INTERWAVE_STB is not set
 # CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set
@@ -2449,11 +2457,13 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SONY_LAPTOP is not set
 # CONFIG_SOUND is not set
 # CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPARSE_IRQ is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
 # CONFIG_SPI is not set
 # CONFIG_SPINLOCK_TEST is not set
 # CONFIG_SPI_BUTTERFLY is not set
@@ -2463,6 +2473,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_RB4XX is not set
 # CONFIG_SPI_RB4XX_CPLD is not set
 # CONFIG_SPI_SPIDEV is not set
@@ -2566,6 +2577,7 @@ CONFIG_TMPFS=y
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
 # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_ELO is not set