[x86] alix2, net5501: bump both subtargets to Linux 3.2.2 to align with the rest

[openwrt.git] / target / linux / x86 / alix2 / target.mk

diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index e8fd737..c322cb4 100644 (file)
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@@ -1,13 +1,13 @@
+LINUX_VERSION:=3.2.2
 BOARDNAME:=PCEngines alix2
 FEATURES:=squashfs jffs2 ext4 pci usb gpio
-ALIX2_GPIO = $(if $(findstring 2.6.32,$(LINUX_VERSION)),gpio-cs5535,gpio-cs5535-new)
 DEFAULT_PACKAGES += \
                        kmod-crypto-hw-geode kmod-crypto-ocf \
-                       kmod-$(ALIX2_GPIO) kmod-gpio-nsc \
+                       kmod-gpio-cs5535-new kmod-gpio-nsc \
                        kmod-wdt-geode kmod-cs5535-clockevt kmod-cs5535-mfgpt \
                        kmod-cs5536 \
                        kmod-hwmon-core kmod-hwmon-lm90 \
-                       kmod-via-rhine kmod-leds-alix \
+                       kmod-via-rhine \
                        kmod-i2c-core kmod-i2c-gpio \
                        kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \
                        kmod-i2c-scx200-acb \
@@ -15,7 +15,8 @@ DEFAULT_PACKAGES += \
                        kmod-cfg80211 kmod-mac80211 \
                        kmod-mppe kmod-pppoe kmod-pppo2ltp \
                        kmod-ath kmod-ath5k kmod-ath9k \
-                       kmod-leds-gpio kmod-input-gpio-buttons \
+                       kmod-leds-gpio kmod-input-gpio-keys-polled \
+                       kmod-button-hotplug \
                        kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
                        kmod-ledtrig-netdev kmod-ledtrig-netfilter \
                        kmod-cpu-msr \
@@ -31,6 +32,6 @@ define Target/Description
        Build firmware images for PCEngines alix2 board
 endef
 
-define KernelPackage/$(ALIX2_GPIO)/install
-     sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/' $(1)/etc/modules.d/??-$(ALIX2_GPIO)
+define KernelPackage/gpio-cs5535-new/install
+     sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/' $(1)/etc/modules.d/??-gpio-cs5535-new
 endef