Merge branch 'master' of git://nbd.name/openwrt

dtaht · Apr 9, 2012 · 71ec681 · 71ec681
2 parents dddf2cb + 3f71dab
commit 71ec681
Show file tree

Hide file tree

Showing 68 changed files with 207 additions and 306 deletions.
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
@@ -35,11 +35,11 @@ endif
 ifeq ($(LINUX_VERSION),3.1.10)
   LINUX_KERNEL_MD5SUM:=3649bdaa50ffd9114cc16486ec54d83a
 endif
-ifeq ($(LINUX_VERSION),3.2.13)
-  LINUX_KERNEL_MD5SUM:=1966afd4474000e48fb1e22a5991882e
+ifeq ($(LINUX_VERSION),3.2.14)
+  LINUX_KERNEL_MD5SUM:=961da0dc037181a4a5059f763b70eabd
 endif
-ifeq ($(LINUX_VERSION),3.3)
-  LINUX_KERNEL_MD5SUM:=98a6cdd7d082b7ea72df9c89842bac74
+ifeq ($(LINUX_VERSION),3.3.1)
+  LINUX_KERNEL_MD5SUM:=ded7229c02a53cd071e541f73b9ef547
 endif
 
 # disable the md5sum check for unknown kernel versions

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
@@ -608,7 +608,9 @@ define KernelPackage/mvsas
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Marvell 88SE6440 SAS/SATA driver
   DEPENDS:=@TARGET_x86 +kmod-libsas
-  KCONFIG:=CONFIG_SCSI_MVSAS
+  KCONFIG:= \
+	CONFIG_SCSI_MVSAS \
+	CONFIG_SCSI_MVSAS_TASKLET=n
   ifneq ($(CONFIG_LINUX_2_6_30),)
 	FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.ko
   else

diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
@@ -27,7 +27,8 @@ define KernelPackage/skge
   TITLE:=SysKonnect Yukon support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SKGE \
-    CONFIG_SKGE_DEBUG=n
+	CONFIG_SKGE_DEBUG=n \
+	CONFIG_SKGE_GENESIS=n
   ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
     FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko
   else

diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
@@ -20,7 +20,8 @@ define KernelPackage/video-core
 	CONFIG_VIDEO_CAPTURE_DRIVERS=y \
 	CONFIG_V4L_USB_DRIVERS=y \
 	CONFIG_V4L_PCI_DRIVERS=y \
-	CONFIG_V4L_PLATFORM_DRIVERS=y
+	CONFIG_V4L_PLATFORM_DRIVERS=y \
+	CONFIG_V4L_ISA_PARPORT_DRIVERS=y
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1)
   FILES:= \
 	$(LINUX_DIR)/drivers/media/video/v4l2-common.ko \

diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz
 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
 SUBTARGETS:=generic nand
 
-LINUX_VERSION:=3.2.13
+LINUX_VERSION:=3.2.14
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
@@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci
 SUBTARGETS=au1500 au1550
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.2.13
+LINUX_VERSION:=3.2.14
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini yamonenv

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb pcmcia
 
-LINUX_VERSION:=3.2.13
+LINUX_VERSION:=3.2.14
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram

diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
 FEATURES:=squashfs broken
 CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
 
-LINUX_VERSION:=3.2.13
+LINUX_VERSION:=3.2.14
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb
 CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.2.13
+LINUX_VERSION:=3.2.14
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
@@ -8,6 +8,7 @@ CONFIG_32BIT=y
 # CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ACPI_APEI is not set
 # CONFIG_ACPI_CUSTOM_METHOD is not set
@@ -164,6 +165,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
@@ -590,6 +592,7 @@ CONFIG_DEVPORT=y
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
@@ -601,6 +604,8 @@ CONFIG_DEVPORT=y
 # CONFIG_EEPROM_DIGSY_MTC_CFG is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
@@ -614,10 +619,12 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_ET131X is not set
+# CONFIG_ETH16I is not set
 CONFIG_ETHERNET=y
 # CONFIG_ETHOC is not set
 # CONFIG_EARLY_PRINTK is not set
 CONFIG_EVENTFD=y
+# CONFIG_EWRK3 is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
 # CONFIG_EXPORTFS is not set
@@ -863,6 +870,8 @@ CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HP100 is not set
 # CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
@@ -1317,6 +1326,7 @@ CONFIG_LOCKD_V4=y
 # CONFIG_LOGO is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_LSI_ET1011C_PHY is not set
@@ -1580,6 +1590,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2K_PCI is not set
+# CONFIG_NE2000 is not set
 # CONFIG_NEC_MARKEINS is not set
 CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
@@ -1747,6 +1758,7 @@ CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
@@ -1836,6 +1848,8 @@ CONFIG_NFS_V3=y
 # CONFIG_NF_NAT_SIP is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_NIU is not set
 CONFIG_NLATTR=y
@@ -2395,6 +2409,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LIS3LV02D is not set
@@ -2445,6 +2460,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -2525,6 +2541,7 @@ CONFIG_SLABINFO=y
 # CONFIG_SLUB_STATS is not set
 # CONFIG_SMARTJOYPLUS_FF is not set
 # CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMP is not set
 # CONFIG_SMSC911X is not set
@@ -2860,6 +2877,7 @@ CONFIG_UDF_NLS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_UFS_FS is not set
 # CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
 # CONFIG_ULTRIX_PARTITION is not set
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
@@ -3269,6 +3287,7 @@ CONFIG_VMSPLIT_3G=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_CORE is not set
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
 # CONFIG_WDTPCI is not set
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PRIV=y