Update linux-kirkwood to 3.6.2

2025-01-27 23:44:04 +00:00 · 2012-10-16 12:02:06 -04:00 · 2012-10-16 12:02:06 -04:00 · 00fa649eb9
commit 00fa649eb9
parent 9ab7fd042b
5 changed files with 636 additions and 691 deletions
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@ -7,7 +7,7 @@ pkgbase=linux-kirkwood
 pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
 #pkgname=linux-test       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=3.5.4
+_basekernel=3.6.2
 pkgver=${_basekernel}
 pkgrel=0
 cryptover=1.5
@ -19,25 +19,25 @@ options=('!strip')
 source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
        'archlinuxarm.patch'
        'support.patch'
-	'aufs3-3.5.patch.xz'
        'config'
        'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
        'change-default-console-loglevel.patch'
        'usb-add-reset-resume-quirk-for-several-webcams.patch'
        "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch")
-md5sums=('95d5c7271ad448bc965bdb29339b6923'
-         '468b0f29653a18d9debd17c99086dc4f'
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
+	'aufs3-3.6.patch.xz')
+md5sums=('daf804cac9e158a7ac529fc622b2186b'
+         '53526a46677489b3e962e7c497e6b0d2'
         'f5d3635da03cb45904bedd69b47133de'
-         '227356bd0efdc6b9a6925d46b3701141'
-         '9a4778bd910c788ff72d78066c41dc47'
+         'f10f5e441a14e33b4200d03f7adee961'
         '9506a43fff451fda36d5d7b1f5eaed04'
         '9d3c56a4b999c8bfbd4018089a62f662'
         'd00814b57448895e65fbbc800e8a58ba'
         '3a4b8d23c1708283e29477931d63ffb8'
-	 '5c0552440670dd3c41629346766cdb4a'
-	 'da1584d485b4bc604d8208b50a6acf42')
+	 'f8d5472706d94a2707dd53bad5ccd00e'
+	 'b5df48a60787f0abe275fe9df1bbef35'
+	 'c8182bf611ab1f9fb3fbc314b61dd04c')

 build() {
  cd "${srcdir}/linux-${_basekernel}"
@ -52,11 +52,11 @@ build() {
  cp "${srcdir}/mach-types" arch/arm/tools

  # Add AUFS3 patches
-  patch -Np1 -i "${srcdir}/aufs3-3.5.patch"
+  patch -Np1 -i "${srcdir}/aufs3-3.6.patch"

  # Add BFQ patches
-  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
-  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch"
+  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
+  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"

  # add latest fixes from stable queue, if needed
  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@ -176,20 +176,18 @@ package_linux-headers-kirkwood() {
    "${pkgdir}/usr/src/linux-${_kernver}/.config"

  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+  make headers_install INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}"

-  for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media net pcmcia scsi sound trace video xen; do
-    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
-  done
-
-   # copy arch includes for external modules
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
-  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood   
-  cp -a arch/$KARCH/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood/
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion
-  cp -a arch/$KARCH/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion/
+  # Clean up unneeded files
+  find "${pkgdir}" -name "..install.cmd" -delete

+  # copy arch includes for external modules
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm
+  cp -a arch/arm/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood   
+  cp -a arch/arm/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion
+  cp -a arch/arm/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion/

  # copy files necessary for later builds, like nvidia and vmware
  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
@ -199,69 +197,16 @@ package_linux-headers-kirkwood() {
  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"

-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel"

-  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  cp arch/arm/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/"

-  if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-  fi
-
-  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
-
-  # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-  done
+  cp arch/arm/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel/"

  # add docbook makefile
  install -D -m644 Documentation/DocBook/Makefile \
    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"

-  # add dm headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-
-  # add inotify.h
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
-  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
-
-  # add wireless headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-
-  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
-  # and...
-  # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-
-  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  # in reference to:
-  # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-
-  # add dvb headers
-  # in reference to:
-  # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
-  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
-
  # add xfs and shmem for aufs building
  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
--- a/core/linux-kirkwood/archlinuxarm.patch
+++ b/core/linux-kirkwood/archlinuxarm.patch
@ -1,14 +1,117 @@
+diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
+--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,99 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood.dtsi"
+-
+-/ {
+-	model = "Seagate GoFlex Net";
+-	compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+-
+-	memory {
+-		device_type = "memory";
+-		reg = <0x00000000 0x8000000>;
+-	};
+-
+-	chosen {
+-		bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+-	};
+-
+-	ocp@f1000000 {
+-		serial@12000 {
+-			clock-frequency = <200000000>;
+-			status = "ok";
+-		};
+-
+-		nand@3000000 {
+-			status = "okay";
+-
+-			partition@0 {
+-				label = "u-boot";
+-				reg = <0x0000000 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@100000 {
+-				label = "uImage";
+-				reg = <0x0100000 0x400000>;
+-			};
+-
+-			partition@500000 {
+-				label = "pogoplug";
+-				reg = <0x0500000 0x2000000>;
+-			};
+-
+-			partition@2500000 {
+-				label = "root";
+-				reg = <0x02500000 0xd800000>;
+-			};
+-		};
+-		sata@80000 {
+-			status = "okay";
+-			nr-ports = <2>;
+-		};
+-
+-	};
+-	gpio-leds {
+-		compatible = "gpio-leds";
+-
+-		health {
+-			label = "status:green:health";
+-			gpios = <&gpio1 14 1>;
+-			linux,default-trigger = "default-on";
+-		};
+-		fault {
+-			label = "status:orange:fault";
+-			gpios = <&gpio1 15 1>;
+-		};
+-		left0 {
+-			label = "status:white:left0";
+-			gpios = <&gpio1 10 0>;
+-		};
+-		left1 {
+-			label = "status:white:left1";
+-			gpios = <&gpio1 11 0>;
+-		};
+-		left2 {
+-			label = "status:white:left2";
+-			gpios = <&gpio1 12 0>;
+-		};
+-		left3 {
+-			label = "status:white:left3";
+-			gpios = <&gpio1 13 0>;
+-		};
+-		right0 {
+-			label = "status:white:right0";
+-			gpios = <&gpio1 6 0>;
+-		};
+-		right1 {
+-			label = "status:white:right1";
+-			gpios = <&gpio1 7 0>;
+-		};
+-		right2 {
+-			label = "status:white:right2";
+-			gpios = <&gpio1 8 0>;
+-		};
+-		right3 {
+-			label = "status:white:right3";
+-			gpios = <&gpio1 9 0>;
+-		};
+-	};
+-};
 diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-08-25 22:32:13.000000000 -0400
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-10-07 11:41:28.000000000 -0400
 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts	1969-12-31 19:00:00.000000000 -0500
-@@ -1,26 +0,0 @@
+@@ -1,72 +0,0 @@
 -/dts-v1/;
 -
 -/include/ "kirkwood.dtsi"
 -
 -/ {
 -	model = "Iomega Iconnect";
-	compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+-	compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 -
 -	memory {
 -		device_type = "memory";
@ -22,29 +125,271 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood
 -	};
 -
 -	ocp@f1000000 {
+-		i2c@11000 {
+-			status = "okay";
+-
+-			lm63: lm63@4c {
+-				compatible = "national,lm63";
+-				reg = <0x4c>;
+-			};
+-		};
 -		serial@12000 {
 -			clock-frequency = <200000000>;
 -			status = "ok";
 -		};
 -	};
-};
-diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
--- a/arch/arm/mach-kirkwood/board-dt.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/board-dt.c	2012-09-06 13:36:28.000000000 -0400
-@@ -62,9 +62,6 @@
- 	if (of_machine_is_compatible("dlink,dns-kirkwood"))
- 		dnskw_init();
- 
-	if (of_machine_is_compatible("iom,iconnect"))
-		iconnect_init();
+-	gpio-leds {
+-		compatible = "gpio-leds";
 -
- 	if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
- 		ib62x0_init();
- 
+-		led-level {
+-			label = "led_level";
+-			gpios = <&gpio1 9 0>;
+-			linux,default-trigger = "default-on";
+-		};
+-		power-blue {
+-			label = "power:blue";
+-			gpios = <&gpio1 10 0>;
+-			linux,default-trigger = "timer";
+-		};
+-		power-red {
+-			label = "power:red";
+-			gpios = <&gpio1 11 0>;
+-		};
+-		usb1 {
+-			label = "usb1:blue";
+-			gpios = <&gpio1 12 0>;
+-		};
+-		usb2 {
+-			label = "usb2:blue";
+-			gpios = <&gpio1 13 0>;
+-		};
+-		usb3 {
+-			label = "usb3:blue";
+-			gpios = <&gpio1 14 0>;
+-		};
+-		usb4 {
+-			label = "usb4:blue";
+-			gpios = <&gpio1 15 0>;
+-		};
+-		otb {
+-			label = "otb:blue";
+-			gpios = <&gpio1 16 0>;
+-		};
+-	};
+-};
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,21 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood-ts219.dtsi"
+-
+-/ {
+-	gpio_keys {
+-		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		button@1 {
+-			label = "USB Copy";
+-			linux,code = <133>;
+-			gpios = <&gpio0 15 1>;
+-		};
+-		button@2 {
+-			label = "Reset";
+-			linux,code = <0x198>;
+-			gpios = <&gpio0 16 1>;
+-		};
+-	};
+-};
+\ No newline at end of file
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,21 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood-ts219.dtsi"
+-
+-/ {
+-	gpio_keys {
+-		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		button@1 {
+-			label = "USB Copy";
+-			linux,code = <133>;
+-			gpios = <&gpio1 11 1>;
+-		};
+-		button@2 {
+-			label = "Reset";
+-			linux,code = <0x198>;
+-			gpios = <&gpio1 5 1>;
+-		};
+-	};
+-};
+\ No newline at end of file
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
+--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	1969-12-31 19:00:00.000000000 -0500
+@@ -1,78 +0,0 @@
+-/include/ "kirkwood.dtsi"
+-
+-/ {
+-	model = "QNAP TS219 family";
+-	compatible = "qnap,ts219", "marvell,kirkwood";
+-
+-	memory {
+-		device_type = "memory";
+-		reg = <0x00000000 0x20000000>;
+-	};
+-
+-	chosen {
+-		bootargs = "console=ttyS0,115200n8";
+-	};
+-
+-	ocp@f1000000 {
+-		i2c@11000 {
+-			status = "okay";
+-			clock-frequency = <400000>;
+-
+-			s35390a: s35390a@30 {
+-				compatible = "s35390a";
+-				reg = <0x30>;
+-			};
+-		};
+-		serial@12000 {
+-			clock-frequency = <200000000>;
+-			status = "okay";
+-		};
+-		serial@12100 {
+-			clock-frequency = <200000000>;
+-			status = "okay";
+-		};
+-		spi@10600 {
+-			status = "okay";
+-
+-			m25p128@0 {
+-				#address-cells = <1>;
+-				#size-cells = <1>;
+-				compatible = "m25p128";
+-				reg = <0>;
+-				spi-max-frequency = <20000000>;
+-				mode = <0>;
+-
+-				partition@0000000 {
+-					reg = <0x00000000 0x00080000>;
+-					label = "U-Boot";
+-				};
+-
+-				partition@00200000 {
+-					reg = <0x00200000 0x00200000>;
+-					label = "Kernel";
+-				};
+-
+-				partition@00400000 {
+-					reg = <0x00400000 0x00900000>;
+-					label = "RootFS1";
+-				};
+-				partition@00d00000 {
+-					reg = <0x00d00000 0x00300000>;
+-					label = "RootFS2";
+-				};
+-				partition@00040000 {
+-					reg = <0x00080000 0x00040000>;
+-					label = "U-Boot Config";
+-				};
+-				partition@000c0000 {
+-					reg = <0x000c0000 0x00140000>;
+-					label = "NAS Config";
+-				};
+-			};
+-		};
+-		sata@80000 {
+-			status = "okay";
+-			nr-ports = <2>;
+-		};
+-	};
+-};
+diff -ruN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
+--- a/arch/arm/mach-kirkwood/board-goflexnet.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,71 +0,0 @@
+-/*
+- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
+- *
+- * arch/arm/mach-kirkwood/board-goflexnet.c
+- *
+- * Seagate GoFlext Net Board Init for drivers not converted to
+- * flattened device tree yet.
+- *
+- * This file is licensed under the terms of the GNU General Public
+- * License version 2.  This program is licensed "as is" without any
+- * warranty of any kind, whether express or implied.
+- *
+- * Copied and modified for Seagate GoFlex Net support by
+- * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
+- * GoFlex kernel patches.
+- *
+- */
+-
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/platform_device.h>
+-#include <linux/ata_platform.h>
+-#include <linux/mv643xx_eth.h>
+-#include <linux/of.h>
+-#include <linux/of_address.h>
+-#include <linux/of_fdt.h>
+-#include <linux/of_irq.h>
+-#include <linux/of_platform.h>
+-#include <linux/gpio.h>
+-#include <asm/mach-types.h>
+-#include <asm/mach/arch.h>
+-#include <asm/mach/map.h>
+-#include <mach/kirkwood.h>
+-#include <mach/bridge-regs.h>
+-#include <plat/mvsdio.h>
+-#include "common.h"
+-#include "mpp.h"
+-
+-static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
+-	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
+-};
+-
+-static unsigned int goflexnet_mpp_config[] __initdata = {
+-	MPP29_GPIO,	/* USB Power Enable */
+-	MPP47_GPIO,	/* LED Orange */
+-	MPP46_GPIO,	/* LED Green */
+-	MPP45_GPIO,	/* LED Left Capacity 3 */
+-	MPP44_GPIO,	/* LED Left Capacity 2 */
+-	MPP43_GPIO,	/* LED Left Capacity 1 */
+-	MPP42_GPIO,	/* LED Left Capacity 0 */
+-	MPP41_GPIO,	/* LED Right Capacity 3 */
+-	MPP40_GPIO,	/* LED Right Capacity 2 */
+-	MPP39_GPIO,	/* LED Right Capacity 1 */
+-	MPP38_GPIO,	/* LED Right Capacity 0 */
+-	0
+-};
+-
+-void __init goflexnet_init(void)
+-{
+-	/*
+-	 * Basic setup. Needs to be called early.
+-	 */
+-	kirkwood_mpp_conf(goflexnet_mpp_config);
+-
+-	if (gpio_request(29, "USB Power Enable") != 0 ||
+-	    gpio_direction_output(29, 1) != 0)
+-		pr_err("can't setup GPIO 29 (USB Power Enable)\n");
+-	kirkwood_ehci_init();
+-
+-	kirkwood_ge00_init(&goflexnet_ge00_data);
+-}
 diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
--- a/arch/arm/mach-kirkwood/board-iconnect.c	2012-08-25 22:32:13.000000000 -0400
+--- a/arch/arm/mach-kirkwood/board-iconnect.c	2012-10-07 11:41:28.000000000 -0400
 +++ b/arch/arm/mach-kirkwood/board-iconnect.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,162 +0,0 @@
+@@ -1,106 +0,0 @@
 -/*
 - * arch/arm/mach-kirkwood/board-iconnect.c
 - *
@ -66,8 +411,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -#include <linux/mtd/partitions.h>
 -#include <linux/mv643xx_eth.h>
 -#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/i2c.h>
 -#include <linux/input.h>
 -#include <linux/gpio_keys.h>
 -#include <asm/mach/arch.h>
@ -79,50 +422,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
 -};
 -
-static struct gpio_led iconnect_led_pins[] = {
-	{
-		.name		= "led_level",
-		.gpio		= 41,
-		.default_trigger = "default-on",
-	}, {
-		.name		= "power:blue",
-		.gpio		= 42,
-		.default_trigger = "timer",
-	}, {
-		.name		= "power:red",
-		.gpio		= 43,
-	}, {
-		.name		= "usb1:blue",
-		.gpio		= 44,
-	}, {
-		.name		= "usb2:blue",
-		.gpio		= 45,
-	}, {
-		.name		= "usb3:blue",
-		.gpio		= 46,
-	}, {
-		.name		= "usb4:blue",
-		.gpio		= 47,
-	}, {
-		.name		= "otb:blue",
-		.gpio		= 48,
-	},
-};
-
-static struct gpio_led_platform_data iconnect_led_data = {
-	.leds		= iconnect_led_pins,
-	.num_leds	= ARRAY_SIZE(iconnect_led_pins),
-	.gpio_blink_set	= orion_gpio_led_blink_set,
-};
-
-static struct platform_device iconnect_leds = {
-	.name	= "leds-gpio",
-	.id	= -1,
-	.dev	= {
-		.platform_data	= &iconnect_led_data,
-	}
-};
-
 -static unsigned int iconnect_mpp_config[] __initdata = {
 -	MPP12_GPIO,
 -	MPP35_GPIO,
@ -137,12 +436,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	0
 -};
 -
-static struct i2c_board_info __initdata iconnect_board_info[] = {
-	{
-		I2C_BOARD_INFO("lm63", 0x4c),
-	},
-};
-
 -static struct mtd_partition iconnect_nand_parts[] = {
 -	{
 -		.name = "flash",
@ -189,15 +482,11 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -{
 -	kirkwood_mpp_conf(iconnect_mpp_config);
 -	kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
-	kirkwood_i2c_init();
-	i2c_register_board_info(0, iconnect_board_info,
-		ARRAY_SIZE(iconnect_board_info));
 -
 -	kirkwood_ehci_init();
 -	kirkwood_ge00_init(&iconnect_ge00_data);
 -
 -	platform_device_register(&iconnect_button_device);
-	platform_device_register(&iconnect_leds);
 -}
 -
 -static int __init iconnect_pci_init(void)
@ -207,10 +496,108 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	return 0;
 -}
 -subsys_initcall(iconnect_pci_init);
+diff -ruN a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
+--- a/arch/arm/mach-kirkwood/board-ts219.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/board-ts219.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,82 +0,0 @@
+-/*
+- *
+- * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
+- *
+- * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
+- *
+- * Based on the board file ts219-setup.c:
+- *
+- * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>
+- * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version
+- * 2 of the License, or (at your option) any later version.
+- */
+-
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/platform_device.h>
+-#include <linux/mv643xx_eth.h>
+-#include <linux/ata_platform.h>
+-#include <linux/gpio_keys.h>
+-#include <linux/input.h>
+-#include <asm/mach-types.h>
+-#include <asm/mach/arch.h>
+-#include <mach/kirkwood.h>
+-#include "common.h"
+-#include "mpp.h"
+-#include "tsx1x-common.h"
+-
+-static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
+-	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
+-};
+-
+-static unsigned int qnap_ts219_mpp_config[] __initdata = {
+-	MPP0_SPI_SCn,
+-	MPP1_SPI_MOSI,
+-	MPP2_SPI_SCK,
+-	MPP3_SPI_MISO,
+-	MPP4_SATA1_ACTn,
+-	MPP5_SATA0_ACTn,
+-	MPP8_TW0_SDA,
+-	MPP9_TW0_SCK,
+-	MPP10_UART0_TXD,
+-	MPP11_UART0_RXD,
+-	MPP13_UART1_TXD,	/* PIC controller */
+-	MPP14_UART1_RXD,	/* PIC controller */
+-	MPP15_GPIO,		/* USB Copy button (on devices with 88F6281) */
+-	MPP16_GPIO,		/* Reset button (on devices with 88F6281) */
+-	MPP36_GPIO,		/* RAM: 0: 256 MB, 1: 512 MB */
+-	MPP37_GPIO,		/* Reset button (on devices with 88F6282) */
+-	MPP43_GPIO,		/* USB Copy button (on devices with 88F6282) */
+-	MPP44_GPIO,		/* Board ID: 0: TS-11x, 1: TS-21x */
+-	0
+-};
+-
+-void __init qnap_dt_ts219_init(void)
+-{
+-	u32 dev, rev;
+-
+-	kirkwood_mpp_conf(qnap_ts219_mpp_config);
+-
+-	kirkwood_pcie_id(&dev, &rev);
+-	if (dev == MV88F6282_DEV_ID)
+-		qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
+-
+-	kirkwood_ge00_init(&qnap_ts219_ge00_data);
+-	kirkwood_ehci_init();
+-
+-	pm_power_off = qnap_tsx1x_power_off;
+-}
+-
+-/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
+-static int __init ts219_pci_init(void)
+-{
+-	if (machine_is_ts219())
+-		kirkwood_pcie_init(KW_PCIE0);
+-
+-	return 0;
+-}
+-subsys_initcall(ts219_pci_init);
 diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
--- a/arch/arm/mach-kirkwood/common.h	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/common.h	2012-09-06 13:36:28.000000000 -0400
-@@ -65,12 +65,6 @@
+--- a/arch/arm/mach-kirkwood/common.h	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/common.h	2012-10-10 15:03:29.000000000 -0400
+@@ -58,11 +58,6 @@
+ #else
+ static inline void dreamplug_init(void) {};
+ #endif
+-#ifdef CONFIG_MACH_TS219_DT
+-void qnap_dt_ts219_init(void);
+-#else
+-static inline void qnap_dt_ts219_init(void) {};
+-#endif
+ 
+ #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
+ void dnskw_init(void);
+@@ -70,24 +65,12 @@
 static inline void dnskw_init(void) {};
 #endif
 
@ -223,9 +610,21 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 #ifdef CONFIG_MACH_IB62X0_DT
 void ib62x0_init(void);
 #else
+ static inline void ib62x0_init(void) {};
+ #endif
+ 
+-#ifdef CONFIG_MACH_GOFLEXNET_DT
+-void goflexnet_init(void);
+-#else
+-static inline void goflexnet_init(void) {};
+-#endif
+-
+ #ifdef CONFIG_MACH_LSXL_DT
+ void lsxl_init(void);
+ #else
 diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-09-06 13:36:28.000000000 -0400
+--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -29,6 +29,10 @@
 		.offset = 0,
 		.size = SZ_1M
@ -271,7 +670,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
 
 diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-09-06 14:14:44.000000000 -0400
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -399,7 +798,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-09-06 14:14:20.000000000 -0400
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -579,8 +978,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +MACHINE_END
 +
 diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-09-06 13:36:28.000000000 -0400
+--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -57,22 +57,24 @@
 
 static struct gpio_led guruplug_led_pins[] = {
@ -612,7 +1011,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
 	},
 diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
 --- a/arch/arm/mach-kirkwood/iconnect-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-09-06 13:36:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@ -820,7 +1219,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
 --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2012-09-06 13:36:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -960,8 +1359,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Kconfig	2012-09-06 13:42:40.000000000 -0400
+--- a/arch/arm/mach-kirkwood/Kconfig	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/Kconfig	2012-10-10 14:47:05.000000000 -0400
@@ -58,12 +58,6 @@
 	  Say 'Y' here if you want your kernel to support the
 	  Marvell DreamPlug (Flattened Device Tree).
@ -975,7 +1374,35 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_DLINK_KIRKWOOD_DT
 	bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
 	select ARCH_KIRKWOOD_DT
-@@ -100,6 +94,54 @@
+@@ -80,27 +74,6 @@
+ 	  RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
+ 	  Flattened Device Tree.
+ 
+-config MACH_TS219_DT
+-	bool "Device Tree for QNAP TS-11X, TS-21X NAS"
+-	select ARCH_KIRKWOOD_DT
+-	select ARM_APPENDED_DTB
+-	select ARM_ATAG_DTB_COMPAT
+-	help
+-	  Say 'Y' here if you want your kernel to support the QNAP
+-	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
+-	  TS-219P+ Turbo NAS devices using Fattened Device Tree.
+-	  There are two different Device Tree descriptions, depending
+-	  on if the device is based on an if the board uses the MV6281
+-	  or MV6282. If you have the wrong one, the buttons will not
+-	  work.
+-
+-config MACH_GOFLEXNET_DT
+-	bool "Seagate GoFlex Net (Flattened Device Tree)"
+-	select ARCH_KIRKWOOD_DT
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Seagate GoFlex Net (Flattened Device Tree).
+-
+ config MACH_LSXL_DT
+ 	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
+ 	select ARCH_KIRKWOOD_DT
+@@ -129,6 +102,54 @@
 	  Say 'Y' here if you want your kernel to support the
 	  Seagate FreeAgent DockStar.
 
@ -1030,7 +1457,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_OPENRD
         bool
 
-@@ -166,6 +208,18 @@
+@@ -195,6 +216,18 @@
 	  Say 'Y' here if you want your kernel to support the
 	  HP t5325 Thin Client.
 
@ -1050,8 +1477,8 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 
 endif
 diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Makefile	2012-09-06 13:43:49.000000000 -0400
+--- a/arch/arm/mach-kirkwood/Makefile	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/Makefile	2012-10-10 14:47:50.000000000 -0400
@@ -8,6 +8,14 @@
 obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
 obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
@ -1067,7 +1494,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
 obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
 obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
-@@ -18,10 +26,11 @@
+@@ -18,13 +26,12 @@
 obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
@ -1080,30 +1507,26 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 -obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o
 obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o
 obj-$(CONFIG_MACH_IB62X0_DT)		+= board-ib62x0.o
+-obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o
+-obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
+ obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 diff -ruN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
--- a/arch/arm/mach-kirkwood/Makefile.boot	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Makefile.boot	2012-09-06 13:36:29.000000000 -0400
-@@ -5,5 +5,4 @@
+--- a/arch/arm/mach-kirkwood/Makefile.boot	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/Makefile.boot	2012-10-10 14:48:04.000000000 -0400
+@@ -5,10 +5,6 @@
 dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
 dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
 dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
 -dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
 dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
-diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
--- a/arch/arm/mach-kirkwood/mpp.h	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/mpp.h	2012-09-06 13:36:29.000000000 -0400
-@@ -102,7 +102,7 @@
- #define MPP11_SATA0_ACTn	MPP( 11, 0x5, 0, 0, 0,   1,   1,   1,   1 )
- 
- #define MPP12_GPO		MPP( 12, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP12_GPIO		MPP( 12, 0x0, 1, 1, 0,   0,   0,   1,   0 )
-+#define MPP12_GPIO		MPP( 12, 0x0, 1, 1, 1,   1,   1,   1,   1 )
- #define MPP12_SD_CLK		MPP( 12, 0x1, 0, 0, 1,   1,   1,   1,   1 )
- #define MPP12_AU_SPDIF0		MPP( 12, 0xa, 0, 0, 0,   0,   0,   0,   1 )
- #define MPP12_SPI_MOSI		MPP( 12, 0xb, 0, 0, 0,   0,   0,   0,   1 )
+-dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6281.dtb
+-dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6282.dtb
+-dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
+ dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
+ dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
 diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
 --- a/arch/arm/mach-kirkwood/nas6210-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2012-09-06 13:36:29.000000000 -0400
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@ -1293,7 +1716,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
 --- a/arch/arm/mach-kirkwood/nsa310-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2012-09-06 14:12:34.000000000 -0400
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,299 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@ -1596,7 +2019,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
 --- a/arch/arm/mach-kirkwood/nsa320-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2012-09-06 14:13:43.000000000 -0400
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,308 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@ -1908,7 +2331,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
 --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2012-09-06 13:36:29.000000000 -0400
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -2027,7 +2450,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
 --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-09-06 13:36:29.000000000 -0400
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,194 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -2224,8 +2647,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-09-06 13:36:29.000000000 -0400
+--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -43,7 +43,7 @@
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };
@ -2306,7 +2729,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
 
 diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
 --- a/arch/arm/mach-kirkwood/topkick-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2012-09-06 13:36:29.000000000 -0400
+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@ -2474,9 +2897,9 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/plat-orion/common.c	2012-09-06 13:36:29.000000000 -0400
-@@ -252,7 +252,9 @@
+--- a/arch/arm/plat-orion/common.c	2012-10-07 11:41:28.000000000 -0400
+++ b/arch/arm/plat-orion/common.c	2012-10-10 13:37:18.000000000 -0400
+@@ -253,7 +253,9 @@
 /*****************************************************************************
  * GE00
  ****************************************************************************/
@ -2488,9 +2911,9 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
 static struct resource orion_ge00_shared_resources[] = {
 	{
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/hwmon/Kconfig	2012-09-06 14:18:09.000000000 -0400
-@@ -1391,6 +1391,19 @@
+--- a/drivers/hwmon/Kconfig	2012-10-07 11:41:28.000000000 -0400
+++ b/drivers/hwmon/Kconfig	2012-10-10 13:37:18.000000000 -0400
+@@ -1411,6 +1411,19 @@
         help
           Support for the A/D converter on MC13783 and MC13892 PMIC.
 
@ -2511,9 +2934,9 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
 
 comment "ACPI drivers"
 diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/hwmon/Makefile	2012-09-06 14:18:57.000000000 -0400
-@@ -96,6 +96,7 @@
+--- a/drivers/hwmon/Makefile	2012-10-07 11:41:28.000000000 -0400
+++ b/drivers/hwmon/Makefile	2012-10-10 13:37:18.000000000 -0400
+@@ -98,6 +98,7 @@
 obj-$(CONFIG_SENSORS_MAX6642)	+= max6642.o
 obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
 obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@ -2523,7 +2946,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
 obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o
 diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 --- a/drivers/hwmon/nsa3xx-hwmon.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2012-09-06 14:19:30.000000000 -0400
+++ b/drivers/hwmon/nsa3xx-hwmon.c	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@ -2777,9 +3200,9 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:nsa3xx-hwmon");
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/core/core.c	2012-09-06 13:36:29.000000000 -0400
-@@ -537,7 +537,7 @@
+--- a/drivers/mmc/core/core.c	2012-10-07 11:41:28.000000000 -0400
+++ b/drivers/mmc/core/core.c	2012-10-10 13:37:18.000000000 -0400
+@@ -546,7 +546,7 @@
 			 */
 			limit_us = 3000000;
 		else
@ -2789,9 +3212,9 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
 		/*
 		 * SDHC cards always use these fixed values.
 diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/core/sd.c	2012-09-06 13:36:29.000000000 -0400
-@@ -389,6 +389,15 @@
+--- a/drivers/mmc/core/sd.c	2012-10-07 11:41:28.000000000 -0400
+++ b/drivers/mmc/core/sd.c	2012-10-10 13:37:18.000000000 -0400
+@@ -355,6 +355,15 @@
 		return -ENOMEM;
 	}
 
@ -2808,8 +3231,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
 	if (err)
 		goto out;
 diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/host/mvsdio.c	2012-09-06 13:36:29.000000000 -0400
+--- a/drivers/mmc/host/mvsdio.c	2012-10-07 11:41:28.000000000 -0400
+++ b/drivers/mmc/host/mvsdio.c	2012-10-10 13:37:18.000000000 -0400
@@ -22,6 +22,7 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
@ -2828,7 +3251,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
 
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
 --- a/include/linux/nsa3xx-hwmon.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/include/linux/nsa3xx-hwmon.h	2012-09-06 14:20:54.000000000 -0400
+++ b/include/linux/nsa3xx-hwmon.h	2012-10-10 13:37:18.000000000 -0400
@@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h
--- a/core/linux-kirkwood/aufs3-3.5.patch.xz
+++ b/core/linux-kirkwood/aufs3-3.5.patch.xz
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.5.1-0 Kernel Configuration
+# Linux/arm 3.6.2-0 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -65,6 +65,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_KTIME_SCALAR=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@ -94,10 +96,7 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
+# CONFIG_MEMCG is not set
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@ -112,7 +111,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@ -162,17 +160,19 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
-# CONFIG_JUMP_LABEL is not set
+CONFIG_JUMP_LABEL=y
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y

 #
 # GCOV-based kernel profiling
@ -267,6 +267,7 @@ CONFIG_FREEZER=y
 # System Type
 #
 CONFIG_MMU=y
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
@ -289,6 +290,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_DOVE is not set
 CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_LPC32XX is not set
@ -335,9 +337,9 @@ CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
 # CONFIG_ARCH_KIRKWOOD_DT is not set
 # CONFIG_MACH_DREAMPLUG_DT is not set
-# CONFIG_MACH_ICONNECT_DT is not set
 # CONFIG_MACH_DLINK_KIRKWOOD_DT is not set
 # CONFIG_MACH_IB62X0_DT is not set
+# CONFIG_MACH_LSXL_DT is not set
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@ -467,6 +469,7 @@ CONFIG_ATAGS_PROC=y
 # CPU Power Management
 #
 # CONFIG_CPU_IDLE is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set

 #
 # Floating point emulation
@ -535,6 +538,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@ -614,6 +618,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 # CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m

@ -636,7 +641,7 @@ CONFIG_NETFILTER_XT_TARGET_HL=m
 # CONFIG_NETFILTER_XT_TARGET_HMARK is not set
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m 
+CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@ -981,6 +986,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@ -1004,7 +1010,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=y
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@ -1019,6 +1024,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@ -1055,6 +1061,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_CMA is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@ -1238,9 +1245,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set

 #
 # Texas Instruments shared transport line discipline
@ -1282,7 +1286,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m

 #
 # SCSI Transports
@ -1676,6 +1679,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
@ -1806,7 +1810,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-# CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
@ -1835,6 +1838,7 @@ CONFIG_RT2800PCI=m
 # CONFIG_RT2800PCI_RT33XX is not set
 CONFIG_RT2800PCI_RT35XX=y
 # CONFIG_RT2800PCI_RT53XX is not set
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@ -1870,8 +1874,6 @@ CONFIG_MWIFIEX_SDIO=m
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
@ -1970,10 +1972,12 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
@ -2075,7 +2079,6 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m

 #
 # I2C Hardware Bus support
@ -2143,6 +2146,7 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPI_ORION=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set

@ -2194,6 +2198,7 @@ CONFIG_GPIO_SYSFS=y
 # PCI GPIO expanders:
 #
 # CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set

@ -2236,6 +2241,7 @@ CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
 # CONFIG_W1_SLAVE_DS2780 is not set
 # CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
@ -2253,6 +2259,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
@ -2286,6 +2293,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
@ -2426,6 +2434,8 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
@ -2445,462 +2455,15 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set

 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-# CONFIG_RC_ATI_REMOTE is not set
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_RC_LOOPBACK=m
-# CONFIG_IR_GPIO_CIR is not set
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-# CONFIG_USB_GSPCA_JL2005BCD is not set
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-# CONFIG_USB_GSPCA_TOPRO is not set
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_PCI_DRIVERS=y
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_CX23885 is not set
-# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_FB_IVTV is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA7164 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-# CONFIG_I2C_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_KEENE is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-# CONFIG_RADIO_WL128X is not set
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-# CONFIG_DVB_USB_PCTV452E is not set
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-# CONFIG_DVB_USB_AZ6007 is not set
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-# CONFIG_DVB_USB_MXL111SF is not set
-# CONFIG_DVB_USB_RTL28XXU is not set
-# CONFIG_DVB_USB_AF9035 is not set
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-# CONFIG_DVB_PLUTO2 is not set
-
-#
-# Supported SDMC DM1105 Adapters
-#
-# CONFIG_DVB_DM1105 is not set
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-# CONFIG_DVB_PT1 is not set
-
-#
-# Supported Mantis Adapters
-#
-# CONFIG_MANTIS_CORE is not set
-
-#
-# Supported nGene Adapters
-#
-# CONFIG_DVB_NGENE is not set
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-# CONFIG_DVB_DDBRIDGE is not set
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set

 #
 # Graphics support
@ -3042,6 +2605,7 @@ CONFIG_SND_USB_CAIAQ=m
 #
 CONFIG_HID=m
 # CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
 CONFIG_HID_GENERIC=m

 #
@ -3072,6 +2636,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 # CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
@ -3366,13 +2931,16 @@ CONFIG_LEDS_NS2=y
 CONFIG_LEDS_NETXBIG=y
 # CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM3556 is not set
 # CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_TRIGGERS=y

 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_GPIO=m
@ -3384,6 +2952,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@ -3411,7 +2980,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_DRV_PCF8563=m 
+CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_BQ32K is not set
@ -3510,6 +3079,7 @@ CONFIG_USB_SERIAL_QUATECH2=m
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_DX_SEP is not set
+# CONFIG_ZSMALLOC is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
 CONFIG_FB_XGI=m
@ -3533,6 +3103,7 @@ CONFIG_FB_XGI=m
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_CSR_WIFI is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@ -3561,6 +3132,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set

 #
 # File systems
@ -3741,10 +3313,11 @@ CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@ -3892,6 +3465,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
@ -4089,6 +3663,8 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
 CONFIG_CRC_CCITT=y
@ -4133,6 +3709,7 @@ CONFIG_HAS_DMA=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
--- a/core/linux-kirkwood/linux-kirkwood.install
+++ b/core/linux-kirkwood/linux-kirkwood.install
@ -2,7 +2,7 @@
 # arg 2:  the old package version

 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.5.4-0-ARCH
+KERNEL_VERSION=3.6.2-0-ARCH

 post_install () {
  # updating module dependencies