core/linux-kirkwood to 3.8.2

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.7.10
+_basekernel=3.8.2
 pkgver=${_basekernel}
 pkgrel=0
 cryptover=1.5
@@ -27,19 +27,18 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
         "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
-	'aufs3-3.7.patch.xz')
+	'aufs3-3.8.patch.xz')
-md5sums=('56ec294a922b6112a1ef129668f38a83'
+md5sums=('ba543a7a61d861f90589de875d2724aa'
-         '17c0496b7f3031c864f49894702b8911'
+         'ddabf9f75419d6e811f30eeb985654d5'
          'f5d3635da03cb45904bedd69b47133de'
-         'b471f37d4dfa802b8a4eaf8c9f437197'
+         '5fa50284cbae738f5076d65bc5519c0f'
          '96fc4f78d37d8f824401b2ca66a5dc0a'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd00814b57448895e65fbbc800e8a58ba'
          '3a4b8d23c1708283e29477931d63ffb8'
-         'fc5936d5966359fcc40e175916e6c65f'
+         '03eca1c188c076041f8d74100d55d659'
-         '9d1c42c395ed5a81a79222a808366687'
+         '90b11395c702610bf4b42e72913f23f8'
-         '961e19a119443158f104a68ea4d0d9f1')
+         '5969c9f71833365582cde1918e368e5b')
-
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -55,7 +54,7 @@ msg2 "requested additional support, mach-types"
   cp "${srcdir}/mach-types" arch/arm/tools
 
 msg2 "Add AUFS3 patches"
-  patch -Np1 -i "${srcdir}/aufs3-3.7.patch"
+  patch -Np1 -i "${srcdir}/aufs3-3.8.patch"
 
 msg2 "Add BFQ patches"
   patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
@@ -182,8 +181,13 @@ package_linux-headers-kirkwood() {
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
   make headers_install INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}"
 
-  # Clean up unneeded files
+# Clean up unneeded files
-  find "${pkgdir}" -name "..install.cmd" -delete
+#  find "${pkgdir}" -name "..install.cmd" -delete
+
+  for i in acpi asm-generic config crypto drm generated linux math-emu \
+    media net pcmcia scsi sound trace uapi 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/arm
@@ -207,10 +211,68 @@ package_linux-headers-kirkwood() {
 
   cp arch/arm/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel/"
 
+ # add headers for lirc package
+  # pci
+  for i in bt8xx cx88 saa7134; do
+mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+  done
+  # usb
+  for i in cpia2 em28xx pwc sn9c102; do
+mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+  done
+  # i2c
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+  cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  for i in cx25840; do
+mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+  done
+
   # 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-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/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/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/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/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/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"
@@ -221,7 +283,7 @@ package_linux-headers-kirkwood() {
     mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
     cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
   done
-
+  
   chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
   find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
 

core/linux-kirkwood/archlinuxarm.patch

@@ -1,346 +1,6 @@
-diff -ruN a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
---- a/arch/arm/boot/dts/kirkwood-dockstar.dts	2012-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts	1970-01-01 01:00:00.000000000 +0100
-@@ -1,57 +0,0 @@
--/dts-v1/;
--
--/include/ "kirkwood.dtsi"
--
--/ {
--	model = "Seagate FreeAgent Dockstar";
--	compatible = "seagate,dockstar", "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 = "data";
--				reg = <0x0500000 0xfb00000>;
--			};
--		};
--	};
--	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>;
--		};
--	};
--};
-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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts	1970-01-01 01:00:00.000000000 +0100
-@@ -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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts	1970-01-01 01:00:00.000000000 +0100
-@@ -1,120 +0,0 @@
--/dts-v1/;
--
--/include/ "kirkwood.dtsi"
--
--/ {
--	model = "Iomega Iconnect";
--	compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
--
--	memory {
--		device_type = "memory";
--		reg = <0x00000000 0x10000000>;
--	};
--
--	chosen {
--		bootargs = "console=ttyS0,115200n8 earlyprintk";
--		linux,initrd-start = <0x4500040>;
--		linux,initrd-end   = <0x4800000>;
--	};
--
--	ocp@f1000000 {
--		i2c@11000 {
--			status = "okay";
--
--			lm63: lm63@4c {
--				compatible = "national,lm63";
--				reg = <0x4c>;
--			};
--		};
--		serial@12000 {
--			clock-frequency = <200000000>;
--			status = "ok";
--		};
--
--		nand@3000000 {
--			status = "okay";
--
--			partition@0 {
--				label = "uboot";
--				reg = <0x0000000 0xc0000>;
--			};
--
--			partition@a0000 {
--				label = "env";
--				reg = <0xa0000 0x20000>;
--			};
--
--			partition@100000 {
--				label = "zImage";
--				reg = <0x100000 0x300000>;
--			};
--
--			partition@540000 {
--				label = "initrd";
--				reg = <0x540000 0x300000>;
--			};
--
--			partition@980000 {
--				label = "boot";
--				reg = <0x980000 0x1f400000>;
--			};
--		};
--	};
--
--	gpio-leds {
--		compatible = "gpio-leds";
--
--		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>;
--		};
--	};
--
--	gpio_keys {
--		compatible = "gpio-keys";
--		#address-cells = <1>;
--		#size-cells = <0>;
--		button@1 {
--			label = "OTB Button";
--			linux,code = <133>;
--			gpios = <&gpio1 3 1>;
--			debounce-interval = <100>;
--		};
--		button@2 {
--			label = "Reset";
--			linux,code = <0x198>;
--			gpios = <&gpio0 12 1>;
--			debounce-interval = <100>;
--		};
--	};
--};
-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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts	1970-01-01 01:00:00.000000000 +0100
-@@ -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>;
--		};
--	};
--};
-\ Kein Zeilenumbruch am Dateiende.
-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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts	1970-01-01 01:00:00.000000000 +0100
-@@ -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>;
--		};
--	};
--};
-\ Kein Zeilenumbruch am Dateiende.
 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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	1969-12-31 17:00:00.000000000 -0700
 @@ -1,78 +0,0 @@
 -/include/ "kirkwood.dtsi"
 -
@@ -420,147 +80,10 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-t
 -		};
 -	};
 -};
-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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/mach-kirkwood/board-goflexnet.c	1970-01-01 01:00:00.000000000 +0100
-@@ -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 <linux/platform_data/mmc-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-12-11 04:30:57.000000000 +0100
-+++ b/arch/arm/mach-kirkwood/board-iconnect.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,58 +0,0 @@
--/*
-- * arch/arm/mach-kirkwood/board-iconnect.c
-- *
-- * Iomega i-connect Board Setup
-- *
-- * 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.
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/platform_device.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/mv643xx_eth.h>
--#include <linux/gpio.h>
--#include <asm/mach/arch.h>
--#include <mach/kirkwood.h>
--#include "common.h"
--#include "mpp.h"
--
--static struct mv643xx_eth_platform_data iconnect_ge00_data = {
--	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
--};
--
--static unsigned int iconnect_mpp_config[] __initdata = {
--	MPP12_GPIO,
--	MPP35_GPIO,
--	MPP41_GPIO,
--	MPP42_GPIO,
--	MPP43_GPIO,
--	MPP44_GPIO,
--	MPP45_GPIO,
--	MPP46_GPIO,
--	MPP47_GPIO,
--	MPP48_GPIO,
--	0
--};
--
--void __init iconnect_init(void)
--{
--	kirkwood_mpp_conf(iconnect_mpp_config);
--
--	kirkwood_ehci_init();
--	kirkwood_ge00_init(&iconnect_ge00_data);
--}
--
--static int __init iconnect_pci_init(void)
--{
--	if (of_machine_is_compatible("iom,iconnect"))
--		kirkwood_pcie_init(KW_PCIE0);
--	return 0;
--}
--subsys_initcall(iconnect_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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/common.h	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/common.h	2012-12-11 18:35:14.634683186 +0100
++++ b/arch/arm/mach-kirkwood/common.h	2013-02-20 06:31:32.000000000 -0700
-@@ -70,12 +70,6 @@
+@@ -71,12 +71,6 @@
  static inline void dnskw_init(void) {};
  #endif
  
@@ -573,7 +96,7 @@ 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
-@@ -88,12 +82,6 @@
+@@ -89,12 +83,6 @@
  static inline void dockstar_dt_init(void) {};
  #endif
  
@@ -586,9 +109,22 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
  #ifdef CONFIG_MACH_LSXL_DT
  void lsxl_init(void);
  #else
+@@ -129,12 +117,6 @@
+ static inline void ns2_init(void) {};
+ #endif
+ 
+-#ifdef CONFIG_MACH_NSA310_DT
+-void nsa310_init(void);
+-#else
+-static inline void nsa310_init(void) {};
+-#endif
+-
+ #ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
+ void openblocks_a6_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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-12-11 18:34:46.744502480 +0100
++++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -29,6 +29,10 @@
  		.offset = 0,
  		.size = SZ_1M
@@ -633,8 +169,8 @@ 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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-12-11 18:34:46.745502504 +0100
++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@@ -761,8 +297,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +MACHINE_END
 +
 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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-12-11 18:34:46.745502504 +0100
++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@@ -942,8 +478,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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-12-11 18:34:46.745502504 +0100
++++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -57,22 +57,24 @@
  
  static struct gpio_led guruplug_led_pins[] = {
@@ -974,8 +510,8 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
  		.active_low		= 1,
  	},
 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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/iconnect-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-12-11 18:34:46.745502504 +0100
++++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@@ -1182,8 +718,8 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +	.restart	= kirkwood_restart,
 +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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2012-12-11 22:47:53.032899067 +0100
++++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@@ -1323,9 +859,9 @@ 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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/Kconfig	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/Kconfig	2012-12-11 18:34:42.668479244 +0100
++++ b/arch/arm/mach-kirkwood/Kconfig	2013-02-20 06:29:01.000000000 -0700
-@@ -58,12 +58,6 @@
+@@ -65,12 +65,6 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Marvell DreamPlug (Flattened Device Tree).
  
@@ -1338,7 +874,7 @@ 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
-@@ -80,34 +74,6 @@
+@@ -87,34 +81,6 @@
  	  RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
  	  Flattened Device Tree.
  
@@ -1373,7 +909,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  config MACH_LSXL_DT
  	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
  	select ARCH_KIRKWOOD_DT
-@@ -150,6 +116,54 @@
+@@ -214,6 +180,54 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Seagate FreeAgent DockStar.
  
@@ -1428,9 +964,9 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  config MACH_OPENRD
          bool
  
-@@ -216,6 +230,18 @@
+@@ -288,6 +302,18 @@
  	  Say 'Y' here if you want your kernel to support the
- 	  HP t5325 Thin Client.
+ 	  ZyXEL NSA-310 board (Flattened Device Tree).
  
 +config MACH_NSA310
 +   bool "ZyXEL NSA310 1-Bay Power Media Server"
@@ -1448,8 +984,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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/Makefile	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/Makefile	2012-12-11 18:36:03.060009252 +0100
++++ b/arch/arm/mach-kirkwood/Makefile	2013-02-20 06:30:41.000000000 -0700
 @@ -8,6 +8,14 @@
  obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
  obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
@@ -1484,9 +1020,16 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
  obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
  obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
  obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+@@ -37,6 +44,5 @@
+ obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o
+ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)	+= board-ns2.o
+ obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)	+= board-ns2.o
+-obj-$(CONFIG_MACH_NSA310_DT)		+= board-nsa310.o
+ obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o
+ obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o
 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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/nas6210-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2012-12-11 18:34:46.746502525 +0100
++++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@@ -1675,8 +1218,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +	.restart	= kirkwood_restart,
 +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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/nsa310-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2012-12-11 18:34:46.746502525 +0100
++++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,299 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@@ -1978,8 +1521,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +	.restart	= kirkwood_restart,
 +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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/nsa320-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2012-12-11 22:22:38.684227039 +0100
++++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,305 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@@ -2287,8 +1830,8 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +	.restart	= kirkwood_restart,
 +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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2012-12-11 18:34:46.747502539 +0100
++++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@@ -2406,8 +1949,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +	.restart	= kirkwood_restart,
 +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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-12-11 22:21:55.149950301 +0100
++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,195 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@@ -2605,8 +2148,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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-12-11 18:34:46.748502553 +0100
++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -43,7 +43,7 @@
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
  };
@@ -2686,8 +2229,8 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
  		kirkwood_sdio_init(&sheevaplug_mvsdio_data);
  
 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	1970-01-01 01:00:00.000000000 +0100
+--- a/arch/arm/mach-kirkwood/topkick-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2012-12-11 22:48:38.712199378 +0100
++++ b/arch/arm/mach-kirkwood/topkick-setup.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@@ -2855,8 +2398,8 @@ 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-12-11 04:30:57.000000000 +0100
+--- a/arch/arm/plat-orion/common.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/arch/arm/plat-orion/common.c	2012-12-11 18:34:46.749502575 +0100
++++ b/arch/arm/plat-orion/common.c	2013-02-20 06:29:01.000000000 -0700
 @@ -253,7 +253,9 @@
  /*****************************************************************************
   * GE00
@@ -2869,8 +2412,8 @@ 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/ata/sata_mv.c b/drivers/ata/sata_mv.c
---- a/drivers/ata/sata_mv.c	2012-12-11 04:30:57.000000000 +0100
+--- a/drivers/ata/sata_mv.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/ata/sata_mv.c	2012-12-11 18:34:46.750502591 +0100
++++ b/drivers/ata/sata_mv.c	2013-02-20 06:29:01.000000000 -0700
 @@ -71,6 +71,7 @@
  #include <scsi/scsi_cmnd.h>
  #include <scsi/scsi_device.h>
@@ -2889,9 +2432,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
  		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
  		if (want_ncq != using_ncq)
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
---- a/drivers/hwmon/Kconfig	2012-12-11 04:30:57.000000000 +0100
+--- a/drivers/hwmon/Kconfig	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/hwmon/Kconfig	2012-12-11 18:34:46.751502596 +0100
++++ b/drivers/hwmon/Kconfig	2013-02-20 06:29:01.000000000 -0700
-@@ -1421,6 +1421,19 @@
+@@ -1440,6 +1440,19 @@
          help
            Support for the A/D converter on MC13783 and MC13892 PMIC.
  
@@ -2912,9 +2455,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-12-11 04:30:57.000000000 +0100
+--- a/drivers/hwmon/Makefile	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/hwmon/Makefile	2012-12-11 18:34:46.751502596 +0100
++++ b/drivers/hwmon/Makefile	2013-02-20 06:29:01.000000000 -0700
-@@ -99,6 +99,7 @@
+@@ -100,6 +100,7 @@
  obj-$(CONFIG_SENSORS_MAX6642)	+= max6642.o
  obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
  obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@@ -2923,8 +2466,8 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
  obj-$(CONFIG_SENSORS_NTC_THERMISTOR)	+= ntc_thermistor.o
  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	1970-01-01 01:00:00.000000000 +0100
+--- a/drivers/hwmon/nsa3xx-hwmon.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2012-12-11 18:34:46.752502597 +0100
++++ b/drivers/hwmon/nsa3xx-hwmon.c	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@@ -3105,7 +2648,7 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +	gpio_free(pdata->data_pin);
 +}
 +
-+static int __devinit nsa3xx_hwmon_probe(struct platform_device *pdev)
++static int nsa3xx_hwmon_probe(struct platform_device *pdev)
 +{
 +	int ret;
 +	struct nsa3xx_hwmon *hwmon;
@@ -3149,7 +2692,7 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +	return ret;
 +}
 +
-+static int __devexit nsa3xx_hwmon_remove(struct platform_device *pdev)
++static int nsa3xx_hwmon_remove(struct platform_device *pdev)
 +{
 +	struct nsa3xx_hwmon *hwmon = platform_get_drvdata(pdev);
 +
@@ -3164,7 +2707,7 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +
 +static struct platform_driver nsa3xx_hwmon_driver = {
 +	.probe = nsa3xx_hwmon_probe,
-+	.remove = __devexit_p(nsa3xx_hwmon_remove),
++	.remove = nsa3xx_hwmon_remove,
 +	.driver = {
 +		.name = "nsa3xx-hwmon",
 +		.owner = THIS_MODULE,
@@ -3178,9 +2721,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/leds/Kconfig b/drivers/leds/Kconfig
---- a/drivers/leds/Kconfig	2012-12-11 04:30:57.000000000 +0100
+--- a/drivers/leds/Kconfig	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/leds/Kconfig	2012-12-11 18:34:46.752502597 +0100
++++ b/drivers/leds/Kconfig	2013-02-20 06:29:01.000000000 -0700
-@@ -494,7 +494,6 @@
+@@ -496,7 +496,6 @@
  
  config LEDS_TRIGGER_IDE_DISK
  	bool "LED IDE Disk Trigger"
@@ -3189,9 +2732,9 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
  	help
  	  This allows LEDs to be controlled by IDE disk activity.
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
---- a/drivers/mmc/core/core.c	2012-12-11 04:30:57.000000000 +0100
+--- a/drivers/mmc/core/core.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/mmc/core/core.c	2012-12-11 18:34:46.753502597 +0100
++++ b/drivers/mmc/core/core.c	2013-02-20 06:29:01.000000000 -0700
-@@ -684,7 +684,7 @@
+@@ -687,7 +687,7 @@
  			 */
  			limit_us = 3000000;
  		else
@@ -3201,8 +2744,8 @@ 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-12-11 04:30:57.000000000 +0100
+--- a/drivers/mmc/core/sd.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/mmc/core/sd.c	2012-12-11 18:34:46.753502597 +0100
++++ b/drivers/mmc/core/sd.c	2013-02-20 06:29:01.000000000 -0700
 @@ -355,6 +355,15 @@
  		return -ENOMEM;
  	}
@@ -3220,8 +2763,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-12-11 04:30:57.000000000 +0100
+--- a/drivers/mmc/host/mvsdio.c	2013-02-18 16:58:34.000000000 -0700
-+++ b/drivers/mmc/host/mvsdio.c	2012-12-11 18:34:46.754502597 +0100
++++ b/drivers/mmc/host/mvsdio.c	2013-02-20 06:29:01.000000000 -0700
 @@ -22,6 +22,7 @@
  #include <linux/clk.h>
  #include <linux/gpio.h>
@@ -3230,7 +2773,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
  
  #include <asm/sizes.h>
  #include <asm/unaligned.h>
-@@ -150,6 +151,7 @@
+@@ -148,6 +149,7 @@
  
  	dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
  		cmd->opcode, mvsd_read(MVSD_HW_STATE));
@@ -3239,8 +2782,8 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
  	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
  
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
---- a/include/linux/nsa3xx-hwmon.h	1970-01-01 01:00:00.000000000 +0100
+--- a/include/linux/nsa3xx-hwmon.h	1969-12-31 17:00:00.000000000 -0700
-+++ b/include/linux/nsa3xx-hwmon.h	2012-12-11 18:34:46.754502597 +0100
++++ b/include/linux/nsa3xx-hwmon.h	2013-02-20 06:29:01.000000000 -0700
 @@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h

core/linux-kirkwood/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.7.10-0 Kernel Configuration
+# Linux/arm 3.8.2-0 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -178,10 +179,10 @@ CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_GENERIC_KERNEL_THREAD=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_GENERIC_KERNEL_EXECVE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
 
 #
 # GCOV-based kernel profiling
@@ -262,7 +263,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
@@ -297,8 +297,7 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_VT8500_SINGLE is not set
-# CONFIG_ARCH_ZYNQ is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 
@@ -319,6 +318,14 @@ CONFIG_MACH_GURUPLUG=y
 # CONFIG_MACH_LSXL_DT is not set
 # CONFIG_MACH_IOMEGA_IX2_200_DT is not set
 # CONFIG_MACH_KM_KIRKWOOD_DT is not set
+# CONFIG_MACH_INETSPACE_V2_DT is not set
+# CONFIG_MACH_MPLCEC4_DT is not set
+# CONFIG_MACH_NETSPACE_V2_DT is not set
+# CONFIG_MACH_NETSPACE_MAX_V2_DT is not set
+# CONFIG_MACH_NETSPACE_LITE_V2_DT is not set
+# CONFIG_MACH_NETSPACE_MINI_V2_DT is not set
+# CONFIG_MACH_OPENBLOCKS_A6_DT is not set
+# CONFIG_MACH_TOPKICK_DT is not set
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -341,8 +348,10 @@ CONFIG_MACH_D2NET_V2=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
+# CONFIG_MACH_NSA310_DT is not set
 CONFIG_MACH_NSA310=y
 CONFIG_MACH_NSA320=y
+# CONFIG_ARCH_VT8500 is not set
 CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y
 
@@ -450,6 +459,7 @@ CONFIG_ATAGS_PROC=y
 # CPU Power Management
 #
 CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -781,9 +791,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
@@ -793,10 +805,9 @@ CONFIG_L2TP=m
 CONFIG_STP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
-# CONFIG_NET_DSA_TAG_DSA is not set
 CONFIG_NET_DSA_TAG_EDSA=y
-# CONFIG_NET_DSA_TAG_TRAILER is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
@@ -1004,7 +1015,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=y
+CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
@@ -1054,13 +1065,12 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_CMA is not set
 
 #
 # Bus devices
 #
-# CONFIG_OMAP_OCP2SCP is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@@ -1184,10 +1194,8 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
+CONFIG_BLK_DEV_DRBD=m
-#
+# CONFIG_DRBD_FAULT_INJECTION is not set
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NVME is not set
 CONFIG_BLK_DEV_SX8=m
@@ -1322,6 +1330,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_LIBFC is not set
@@ -1347,6 +1356,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
@@ -1541,6 +1551,7 @@ CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1E is not set
 # CONFIG_ATL1C is not set
+# CONFIG_NET_CADENCE is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BNX2 is not set
@@ -1589,6 +1600,7 @@ CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MV643XX_ETH=y
+CONFIG_MVMDIO=m
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 CONFIG_NET_VENDOR_MELLANOX=y
@@ -1614,7 +1626,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
 # CONFIG_FORCEDETH is not set
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_PCH_GBE=y
-# CONFIG_PCH_PTP is not set
 # CONFIG_ETHOC is not set
 CONFIG_NET_PACKET_ENGINE=y
 # CONFIG_HAMACHI is not set
@@ -1718,6 +1729,7 @@ CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 # CONFIG_USB_NET_CDC_EEM is not set
 CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@@ -1758,6 +1770,7 @@ CONFIG_RTL8187_LEDS=y
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_MWL8K=m
 CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -1780,6 +1793,9 @@ CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 CONFIG_ATH6KL_USB=m
 # CONFIG_ATH6KL_DEBUG is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
 CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
@@ -1863,6 +1879,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_DEBUG=y
@@ -1929,7 +1946,6 @@ CONFIG_KEYBOARD_TCA6416=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
@@ -2025,6 +2041,7 @@ CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -2071,7 +2088,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -2113,6 +2130,7 @@ CONFIG_I2C_ALGOBIT=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EG20T is not set
@@ -2169,7 +2187,15 @@ CONFIG_SPI_ORION=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
 
 #
 # PPS generators support
@@ -2178,10 +2204,23 @@ CONFIG_SPI_ORION=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y
 
 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PTP_1588_CLOCK_PCH=y
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -2193,6 +2232,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
 
 #
@@ -2226,6 +2266,10 @@ CONFIG_GPIO_SYSFS=y
 #
 # MODULbus GPIO expanders:
 #
+
+#
+# USB GPIO expanders:
+#
 CONFIG_W1=m
 
 #
@@ -2236,7 +2280,6 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
 CONFIG_W1_MASTER_GPIO=m
-# CONFIG_HDQ_MASTER_OMAP is not set
 
 #
 # 1-wire Slaves
@@ -2268,7 +2311,9 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_VID is not set
@@ -2379,6 +2424,12 @@ CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_NSA3XX=m
 CONFIG_THERMAL=m
 CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_FAIR_SHARE is not set
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2419,6 +2470,7 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_BCMA_POSSIBLE=y
 
 #
@@ -2431,7 +2483,9 @@ CONFIG_BCMA_POSSIBLE=y
 #
 CONFIG_MFD_CORE=m
 # CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_RTSX_PCI is not set
 # CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_UCB1400_CORE is not set
@@ -2462,6 +2516,8 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_VX855 is not set
 CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -2735,8 +2791,14 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 
 #
@@ -3135,6 +3197,7 @@ CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
+# CONFIG_HID_ICADE is not set
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 # CONFIG_HID_LCPOWER is not set
@@ -3190,6 +3253,11 @@ CONFIG_HID_SENSOR_HUB=m
 CONFIG_USB_HID=m
 # CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -3219,6 +3287,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -3371,8 +3440,8 @@ CONFIG_USB_EZUSB_FX2=m
 #
 # USB Physical Layer drivers
 #
-# CONFIG_OMAP_USB2 is not set
 # CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_GADGET is not set
 
 #
@@ -3488,6 +3557,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_PCF8523 is not set
 CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
@@ -3578,7 +3648,6 @@ CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
 # CONFIG_RTLLIB is not set
 CONFIG_R8712U=y
-# CONFIG_RTS_PSTOR is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
@@ -3607,9 +3676,7 @@ CONFIG_FB_XGI=m
 # Android
 #
 # CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
 # 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_NET_VENDOR_SILICOM=y
@@ -3647,6 +3714,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
+# CONFIG_IPACK_BUS is not set
 
 #
 # File systems
@@ -3662,7 +3730,6 @@ CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 # CONFIG_EXT4_FS_SECURITY is not set
 # CONFIG_EXT4_DEBUG is not set
@@ -3806,6 +3873,7 @@ CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_F2FS_FS is not set
 CONFIG_AUFS_FS=y
 CONFIG_AUFS_BRANCH_MAX_127=y
 # CONFIG_AUFS_BRANCH_MAX_511 is not set
@@ -3856,6 +3924,7 @@ CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_ACL is not set
+CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
@@ -4049,6 +4118,7 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -4152,6 +4222,7 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=y
@@ -4192,6 +4263,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
@@ -4235,6 +4307,7 @@ CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set

core/linux-kirkwood/linux-kirkwood.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.7.10-0-ARCH
+KERNEL_VERSION=3.8.2-0-ARCH
 
 post_install () {
   # updating module dependencies