core/linux-orion to 3.1.7-2

core/linux-orion/PKGBUILD

@@ -7,32 +7,56 @@ pkgbase=linux-orion
 pkgname=('linux-orion' 'linux-headers-orion')
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=3.0
-pkgver=${_basekernel}.3
-pkgrel=1
+_basekernel=3.1
+pkgver=${_basekernel}.7
+pkgrel=2
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
 options=('!strip')
-source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.bz2"
-        "ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-${pkgver}.bz2"
+source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
+        "ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2"
         'archlinuxarm.patch'
+        'support.patch'
+        'aufs3-kbuild.patch'
+        'aufs3-base.patch'
+        'aufs3-standalone.patch'
+        'aufs3-git-extras.patch'
         'config'
-        'change-default-console-loglevel.patch')
-md5sums=('398e95866794def22b12dfbc15ce89c0'
-         '1757786b9a9ffbd48ad9642199ff5bd7'
-         '77e8e011485c2061616214d07356132e'
-         '1d5e11e7d81c314f8c9bde5d5b63da3e'
-         '9d3c56a4b999c8bfbd4018089a62f662')
+        'change-default-console-loglevel.patch'
+        'usb-add-reset-resume-quirk-for-several-webcams.patch')
+md5sums=('8d43453f8159b2332ad410b19d86a931'
+         '13ea1e611a0a580138b8203e6f1353ed'
+         '18f59dbd0df3dd7b36e8c4714e2c6725'
+         'f5d3635da03cb45904bedd69b47133de'
+         '3f64ed9d71499fe9293dc671f4e4087e'
+         '29628745258df910abfb8cb24ca3ccd9'
+         'c9e6e8bb0774a89f7f9bd30a13be7532'
+         '55b04499a4578e586cf5a4d0b69fc5aa'
+         '6022a2440b7c671b6e55dad3a71e1f2b'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         'd00814b57448895e65fbbc800e8a58ba')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
+  # add upstream patch
   patch -p1 -i "${srcdir}/patch-${pkgver}"
 
-  # Add Arch Linux ARM patch for ARMv5te plug computers
-  patch -Np1 -i ${srcdir}/archlinuxarm.patch
+  # Add the USB_QUIRK_RESET_RESUME for several webcams
+  # FS#26528
+  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
+
+  # Add Arch Linux ARM patch for ARMv5te plug computers and requested additional support
+  patch -Np1 -i "${srcdir}/archlinuxarm.patch"
+  patch -Np1 -i "${srcdir}/support.patch"
+
+  # Add AUFS3 patches
+  patch -Np1 -i "${srcdir}/aufs3-kbuild.patch"
+  patch -Np1 -i "${srcdir}/aufs3-base.patch"
+  patch -Np1 -i "${srcdir}/aufs3-standalone.patch"
+  patch -Np1 -i "${srcdir}/aufs3-git-extras.patch"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -44,14 +68,11 @@ build() {
 
   cat "${srcdir}/config" > ./.config
 
-  # remove the sublevel from Makefile
-  # this ensures our kernel version is always 3.X-ARCH
-  # this way, minor kernel updates will not break external modules
-  # we need to change this soon, see FS#16702
-  sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
   # get kernel version
-  #make prepare
+  make prepare
 
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
@@ -82,7 +103,7 @@ package_linux-orion() {
   groups=('base')
   depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7' 'devio')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' 'kernel26-orion' 'linux=${pkgver}')
+  provides=('kernel26' 'aufs_friendly' 'kernel26-orion' 'linux=${pkgver}')
   conflicts=('kernel26' 'kernel26-orion')
   replaces=('kernel26-orion')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
@@ -109,8 +130,13 @@ package_linux-orion() {
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to safe 100MB of space
+  # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
 }
 
 package_linux-headers-orion() {

core/linux-orion/archlinuxarm.patch

@@ -1,6 +1,6 @@
 diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
---- a/arch/arm/mach-kirkwood/dockstar-setup.c	2011-05-18 22:06:34.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2011-07-01 13:18:36.000000000 -0600
+--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-01-14 03:32:44.000000000 -0700
 @@ -19,7 +19,6 @@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@ -54,7 +54,7 @@ diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
  
 diff -urN 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 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2011-07-01 13:25:34.000000000 -0600
++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-01-14 03:32:44.000000000 -0700
 @@ -0,0 +1,123 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@@ -181,7 +181,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -urN 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 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2011-07-01 13:25:49.000000000 -0600
++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-01-14 03:32:44.000000000 -0700
 @@ -0,0 +1,176 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@@ -360,8 +360,8 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +MACHINE_END
 +
 diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
---- a/arch/arm/mach-kirkwood/guruplug-setup.c	2011-05-18 22:06:34.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2011-07-01 13:18:36.000000000 -0600
+--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-01-14 03:32:44.000000000 -0700
 @@ -57,22 +57,24 @@
  
  static struct gpio_led guruplug_led_pins[] = {
@@ -391,10 +391,217 @@ diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
  		.gpio			= 49,
  		.active_low		= 1,
  	},
+diff -urN 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 17:00:00.000000000 -0700
++++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-01-14 03:32:44.000000000 -0700
+@@ -0,0 +1,203 @@
++/*
++ * arch/arm/mach-kirkwood/iconnect-setup.c
++ *
++ * Iomega iConnect Wireless
++ *
++ * 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/irq.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mv643xx_eth.h>
++#include <linux/ethtool.h>
++#include <linux/gpio.h>
++#include <linux/gpio_keys.h>
++#include <linux/input.h>
++#include <linux/leds.h>
++#include <linux/i2c.h>
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <mach/kirkwood.h>
++#include "common.h"
++#include "mpp.h"
++
++static struct mtd_partition iconnect_nand_parts[] = {
++	{
++		.name = "u-boot",
++		.offset = 0,
++		.size = SZ_1M
++	}, {
++		.name = "uImage",
++		.offset = MTDPART_OFS_NXTBLK,
++		.size = SZ_1M + SZ_2M
++	}, {
++		.name = "rootfs",
++		.offset = MTDPART_OFS_NXTBLK,
++		.size = SZ_32M,
++	}, {
++		.name = "data",
++		.offset = MTDPART_OFS_NXTBLK,
++		.size = MTDPART_SIZ_FULL
++	},
++};
++
++static struct mv643xx_eth_platform_data iconnect_ge00_data = {
++	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
++};
++
++static struct gpio_led iconnect_led_pins[] = {
++	{
++		.name			= "iconnect:led_level",
++		.default_trigger	= "default-on",
++		.gpio			= 41,
++	},
++	{
++		.name			= "iconnect:blue:power",
++		.default_trigger	= "default-on",
++		.gpio			= 42,
++	},
++	{
++		.name			= "iconnect:red:power",
++		.gpio			= 43,
++	},
++	{
++		.name			= "iconnect:blue:usb1",
++		.gpio			= 44,
++	},
++	{
++		.name			= "iconnect:blue:usb2",
++		.gpio			= 45,
++	},
++	{
++		.name			= "iconnect:blue:usb3",
++		.gpio			= 46,
++	},
++	{
++		.name			= "iconnect:blue:usb4",
++		.gpio			= 47,
++	},
++	{
++		.name			= "iconnect:blue:otb",
++		.gpio			= 48,
++	},
++};
++
++static struct gpio_led_platform_data iconnect_led_data = {
++	.leds		= iconnect_led_pins,
++	.num_leds	= ARRAY_SIZE(iconnect_led_pins),
++};
++
++static struct platform_device iconnect_leds = {
++	.name	= "leds-gpio",
++	.id	= -1,
++	.dev	= {
++		.platform_data	= &iconnect_led_data,
++	}
++};
++
++#define ICONNECT_GPIO_KEY_RESET		12
++#define ICONNECT_GPIO_KEY_OTB		35
++
++#define ICONNECT_SW_RESET		0x00
++#define ICONNECT_SW_OTB			0x01
++
++static struct gpio_keys_button iconnect_buttons[] = {
++		{
++		.type		= EV_SW,
++		.code		= ICONNECT_SW_RESET,
++		.gpio		= ICONNECT_GPIO_KEY_RESET,
++		.desc		= "Reset Button",
++		.active_low	= 1,
++		.debounce_interval = 100,
++		}, 
++		{
++		.type		= EV_SW,
++		.code		= ICONNECT_SW_OTB,
++		.gpio		= ICONNECT_GPIO_KEY_OTB,
++		.desc		= "OTB Button",
++		.active_low	= 1,
++		.debounce_interval = 100,
++		},
++};
++
++static struct gpio_keys_platform_data iconnect_button_data = {
++	.buttons	= iconnect_buttons,
++	.nbuttons	= ARRAY_SIZE(iconnect_buttons),
++};
++
++static struct platform_device iconnect_button_device = {
++	.name	   = "gpio-keys",
++	.id	     = -1,
++	.num_resources	= 0,
++	.dev	    =	{
++					.platform_data  = &iconnect_button_data,
++					},
++};
++
++static unsigned int iconnect_mpp_config[] __initdata = {
++	MPP12_GPIO, /*Input for reset button*/
++	MPP35_GPIO, /*Input for OTB button*/
++	MPP41_GPIO,
++	MPP42_GPIO,
++	MPP43_GPIO,
++	MPP44_GPIO,
++	MPP45_GPIO,
++	MPP46_GPIO,
++	MPP47_GPIO,
++	MPP48_GPIO,
++	0
++};
++
++static struct i2c_board_info __initdata iconnect_i2c_rtc = {
++	I2C_BOARD_INFO("lm63", 0x4c),
++};
++
++static void __init iconnect_init(void)
++{
++	u32 dev, rev;
++
++	/*
++	 * Basic setup. Needs to be called early.
++	 */
++	kirkwood_init();
++	kirkwood_mpp_conf(iconnect_mpp_config);
++
++	kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
++	kirkwood_ehci_init();
++
++	kirkwood_ge00_init(&iconnect_ge00_data);
++	kirkwood_pcie_id(&dev, &rev);
++
++	kirkwood_uart0_init();
++
++	platform_device_register(&iconnect_leds);
++	platform_device_register(&iconnect_button_device);
++	
++	kirkwood_i2c_init();
++	i2c_register_board_info(0, &iconnect_i2c_rtc, 1);
++
++}
++
++static int __init iconnect_pci_init(void)
++{
++	if (machine_is_iconnect())
++		kirkwood_pcie_init(KW_PCIE0);
++
++	return 0;
++}
++subsys_initcall(iconnect_pci_init);
++
++
++MACHINE_START(ICONNECT, "Iomega iConnect Wireless")
++	.boot_params	= 0x00000100,
++	.init_machine	= iconnect_init,
++	.map_io		= kirkwood_map_io,
++	.init_early	= kirkwood_init_early,
++	.init_irq	= kirkwood_init_irq,
++	.timer		= &kirkwood_timer,
++MACHINE_END
 diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
---- a/arch/arm/mach-kirkwood/Kconfig	2011-05-18 22:06:34.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Kconfig	2011-07-01 13:18:36.000000000 -0600
-@@ -64,6 +64,18 @@
+--- a/arch/arm/mach-kirkwood/Kconfig	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/Kconfig	2012-01-14 04:04:19.000000000 -0700
+@@ -64,6 +64,31 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Seagate FreeAgent DockStar.
  
@@ -409,25 +616,249 @@ diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 +        help
 +          Say 'Y' here if you want your kernel to support the
 +          Seagate GoFlex Home.
++
++config MACH_ICONNECT
++	bool "Iomega iConnect Wireless"
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Iomega iConnect Wireless. Overrides Marvell RD-88F6281
++	  Reference Board.
++
++config MACH_POGOPLUGV4
++	bool "Pogoplug Series 4"
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Pogoplug Series 4.
 +
  config MACH_OPENRD
          bool
  
 diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
---- a/arch/arm/mach-kirkwood/Makefile	2011-05-18 22:06:34.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Makefile	2011-07-01 13:18:36.000000000 -0600
-@@ -8,6 +8,8 @@
+--- a/arch/arm/mach-kirkwood/Makefile	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/Makefile	2012-01-14 03:36:39.000000000 -0700
+@@ -8,6 +8,10 @@
  obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
  obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
  obj-$(CONFIG_MACH_DOCKSTAR)		+= dockstar-setup.o
 +obj-$(CONFIG_MACH_GOFLEXNET)		+= goflexnet-setup.o
 +obj-$(CONFIG_MACH_GOFLEXHOME)		+= goflexhome-setup.o
++obj-$(CONFIG_MACH_ICONNECT)		+= iconnect-setup.o
++obj-$(CONFIG_MACH_POGOPLUGV4)		+= pogoplugv4-setup.o
  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
+diff -urN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
+--- a/arch/arm/mach-kirkwood/mpp.h	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/mpp.h	2012-01-14 03:32:44.000000000 -0700
+@@ -102,6 +102,7 @@
+ #define MPP11_SATA0_ACTn	MPP( 11, 0x5, 0, 1, 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, 1,   1,   1,   1,   1 )
+ #define MPP12_SD_CLK		MPP( 12, 0x1, 0, 1, 1,   1,   1,   1,   1 )
+ #define MPP12_AU_SPDIF0		MPP( 12, 0xa, 0, 1, 0,   0,   0,   0,   1 )
+ #define MPP12_SPI_MOSI		MPP( 12, 0xb, 0, 1, 0,   0,   0,   0,   1 )
+diff -urN 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 17:00:00.000000000 -0700
++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-01-14 04:34:06.000000000 -0700
+@@ -0,0 +1,194 @@
++/*
++ * arch/arm/mach-kirkwood/pogoplugv4-setup.c
++ *
++ * Pogoplug Series 4 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/mtd/partitions.h>
++#include <linux/ata_platform.h>
++#include <linux/mv643xx_eth.h>
++#include <linux/gpio.h>
++#include <linux/gpio_keys.h>
++#include <linux/leds.h>
++#include <linux/pci.h>
++#include <linux/irq.h>
++#include <linux/spi/flash.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/orion_spi.h>
++#include <linux/input.h>
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <mach/kirkwood.h>
++#include <plat/mvsdio.h>
++#include "common.h"
++#include "mpp.h"
++
++#define POGOPLUGV4_GPIO_USB_VBUS		10
++
++static struct mtd_partition ppv4_nand_parts[] = {
++	{
++		.name	= "u-boot",
++		.offset	= 0,
++		.size	= 2 * SZ_1M
++	}, {
++		.name	= "uImage",
++		.offset	= MTDPART_OFS_NXTBLK,
++		.size	= 3 * SZ_1M
++	}, {
++		.name	= "uImage2",
++		.offset	= MTDPART_OFS_NXTBLK,
++		.size	= 3 * SZ_1M
++	}, {
++		.name	= "failsafe",
++		.offset	= MTDPART_OFS_NXTBLK,
++		.size	= SZ_8M
++	}, {
++		.name	= "root",
++		.offset	= MTDPART_OFS_NXTBLK,
++		.size	= MTDPART_SIZ_FULL
++	},
++};
++
++static struct mv643xx_eth_platform_data pogoplugv4_ge00_data = {
++	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
++};
++
++static struct mv_sata_platform_data pogoplugv4_sata_data = {
++	.n_ports	= 1,
++};
++
++static struct gpio_keys_button pogoplugv4_button_pins[] = {
++	{
++		.code		= KEY_EJECTCD,
++		.gpio		= 29,
++		.desc		= "Eject Button",
++		.active_low	= 1,
++	},
++};
++
++static struct gpio_keys_platform_data pogoplugv4_button_data = {
++	.buttons	= pogoplugv4_button_pins,
++	.nbuttons	= ARRAY_SIZE(pogoplugv4_button_pins),
++};
++
++static struct platform_device pogoplugv4_buttons = {
++	.name		= "gpio-keys",
++	.id		= -1,   
++	.num_resources  = 0,
++	.dev		= {
++		.platform_data  = &pogoplugv4_button_data,
++	},
++};
++
++static struct gpio_led pogoplugv4_led_pins[] = {
++	{
++		.name			= "status:green:health",
++		.default_trigger	= "default-on",
++		.gpio			= 22,
++		.active_low		= 1,
++	},
++	{
++		.name			= "status:red:fault",
++		.default_trigger	= "none",
++		.gpio			= 24,
++		.active_low		= 1,
++	},
++};
++
++static struct gpio_led_platform_data pogoplugv4_led_data = {
++	.leds		= pogoplugv4_led_pins,
++	.num_leds	= ARRAY_SIZE(pogoplugv4_led_pins),
++};
++
++static struct platform_device pogoplugv4_leds = {
++	.name	= "leds-gpio",
++	.id	= -1,
++	.dev	= {
++		.platform_data	= &pogoplugv4_led_data,
++	}
++};
++
++static struct mvsdio_platform_data ppv4_mvsdio_data = {
++	.gpio_card_detect = 27,
++};
++
++static unsigned int ppv4_mpp_config[] __initdata = {
++	MPP27_GPIO,	/* SD card detect */
++	MPP29_GPIO,	/* Eject button */
++	MPP22_GPIO,	/* Green LED */
++	MPP24_GPIO,	/* Red LED */
++	MPP12_SD_CLK,
++	MPP13_SD_CMD,
++	MPP14_SD_D0,
++	MPP15_SD_D1,
++	MPP16_SD_D2,
++	MPP17_SD_D3,
++	0
++};
++
++static const struct flash_platform_data pogoplugv4_spi_slave_data = {
++	.type		= "m25p05-nonjedec",
++};
++
++static struct spi_board_info __initdata pogoplugv4_spi_slave_info[] = {
++	{
++		.modalias	= "m25p05-nonjedec",
++		.platform_data	= &pogoplugv4_spi_slave_data,
++		.irq		= -1,
++		.max_speed_hz	= 20000000,
++		.bus_num	= 0,
++		.chip_select	= 0,
++	},
++};
++
++static void __init pogoplugv4_init(void)
++{
++	/*
++	 * Basic setup. Needs to be called early.
++	 */
++	kirkwood_init();
++	kirkwood_mpp_conf(ppv4_mpp_config);
++
++	orion_gpio_set_valid(POGOPLUGV4_GPIO_USB_VBUS, 1);
++	if (gpio_request(POGOPLUGV4_GPIO_USB_VBUS, "USB VBUS") != 0 ||
++	    gpio_direction_output(POGOPLUGV4_GPIO_USB_VBUS, 1) != 0)
++		pr_err("POGOPLUGV4: failed to setup USB VBUS GPIO\n");
++
++	kirkwood_ehci_init();
++	kirkwood_ge00_init(&pogoplugv4_ge00_data);
++	kirkwood_sata_init(&pogoplugv4_sata_data);
++	spi_register_board_info(pogoplugv4_spi_slave_info,
++				ARRAY_SIZE(pogoplugv4_spi_slave_info));
++	kirkwood_spi_init();
++	kirkwood_uart0_init();
++	kirkwood_nand_init(ARRAY_AND_SIZE(ppv4_nand_parts), 25);
++	kirkwood_sdio_init(&ppv4_mvsdio_data);
++	platform_device_register(&pogoplugv4_leds);
++	platform_device_register(&pogoplugv4_buttons);
++}
++
++static int __init pogoplugv4_pci_init(void)
++{
++	if (machine_is_pogoplugv4())
++		kirkwood_pcie_init(KW_PCIE0);
++
++	return 0;
++}
++subsys_initcall(pogoplugv4_pci_init);
++
++MACHINE_START(POGOPLUGV4, "Pogoplug V4")
++	/* Maintainer: Kevin Mihelich <kevin@archlinuxarm.org> */
++	.boot_params	= 0x00000100,
++	.init_machine	= pogoplugv4_init,
++	.map_io		= kirkwood_map_io,
++	.init_early	= kirkwood_init_early,
++	.init_irq	= kirkwood_init_irq,
++	.timer		= &kirkwood_timer,
++MACHINE_END
 diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
---- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-05-18 22:06:34.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-07-01 13:22:51.000000000 -0600
+--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-01-14 03:32:44.000000000 -0700
 @@ -64,7 +64,13 @@
  		.active_low		= 1,
  	},
@@ -464,3 +895,11 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
  	0
  };
  
+diff -urN a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
+--- a/arch/arm/tools/mach-types	2011-10-24 01:10:05.000000000 -0600
++++ b/arch/arm/tools/mach-types	2012-01-14 03:41:57.000000000 -0700
+@@ -1113,3 +1113,4 @@
+ thales_adc		MACH_THALES_ADC		THALES_ADC		3492
+ ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
+ atdgp318		MACH_ATDGP318		ATDGP318		3494
++pogoplugv4		MACH_POGOPLUGV4		POGOPLUGV4		3960

core/linux-orion/aufs3-base.patch

@@ -0,0 +1,70 @@
+aufs3.1 base patch
+
+diff --git a/fs/namei.c b/fs/namei.c
+index 0b3138d..8edad02 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1748,7 +1748,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+  * needs parent already locked. Doesn't follow mounts.
+  * SMP-safe.
+  */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+diff --git a/fs/splice.c b/fs/splice.c
+index fa2defa..e3569b0 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+  * Attempt to initiate a splice from pipe to file.
+  */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+-			   loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++		    loff_t *ppos, size_t len, unsigned int flags)
+ {
+ 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ 				loff_t *, size_t, unsigned int);
+@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+  */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
+ {
+ 	ssize_t (*splice_read)(struct file *, loff_t *,
+ 			       struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 409328d..40afdc0 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -84,6 +84,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *));
+ 
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+ extern int follow_down_one(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 26e5b61..3ffef2f 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
+ extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
+ 
+ extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
++
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++			   loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
+ #endif

core/linux-orion/aufs3-kbuild.patch

@@ -0,0 +1,35 @@
+aufs3.1 kbuild patch
+
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 9fe0b34..c4311f8 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -215,6 +215,7 @@ source "fs/pstore/Kconfig"
+ source "fs/sysv/Kconfig"
+ source "fs/ufs/Kconfig"
+ source "fs/exofs/Kconfig"
++source "fs/aufs/Kconfig"
+ 
+ endif # MISC_FILESYSTEMS
+ 
+diff --git a/fs/Makefile b/fs/Makefile
+index afc1096..5c5ac76 100644
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
+ obj-$(CONFIG_EXOFS_FS)          += exofs/
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
++obj-$(CONFIG_AUFS_FS)           += aufs/
+diff --git a/include/linux/Kbuild b/include/linux/Kbuild
+index 619b565..29f386b 100644
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -65,6 +65,7 @@ header-y += atmppp.h
+ header-y += atmsap.h
+ header-y += atmsvc.h
+ header-y += audit.h
++header-y += aufs_type.h
+ header-y += auto_fs.h
+ header-y += auto_fs4.h
+ header-y += auxvec.h

core/linux-orion/aufs3-standalone.patch

@@ -0,0 +1,249 @@
+aufs3.1 standalone patch
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index c322794..2aad244 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(file_sb_list_del);
++
+ #ifdef CONFIG_SMP
+ 
+ /*
+diff --git a/fs/inode.c b/fs/inode.c
+index ec79246..46ac6f9 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
+ 
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
++EXPORT_SYMBOL(inode_sb_list_lock);
+ 
+ /*
+  * Empty aops. Can be used for the cases where the user does not
+diff --git a/fs/namei.c b/fs/namei.c
+index 8edad02..50e8718 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1752,6 +1752,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+ 
+ /**
+  * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index b4febb2..598a308 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
+ 
+ static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index 63fc294..6f4adca 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+ 
+ 	return group;
+ }
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index e14587d..be6533b 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+ 	if (atomic_dec_and_test(&mark->refcnt))
+ 		mark->free_mark(mark);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+ 
+ /*
+  * Any time a mark is getting freed we end up here.
+@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+ 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ 		fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark);
+ 
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -276,6 +278,7 @@ err:
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * clear any marks in a group in which mark->flags & flags is true
+@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ 	atomic_set(&mark->refcnt, 1);
+ 	mark->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+ 
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff --git a/fs/open.c b/fs/open.c
+index f711921..d742fc0 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+ 
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index e3569b0..9dc07b7 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index a93b3b7..024282c 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ 	}
+ 	return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index 4450fbe..2c437e5 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -500,6 +500,7 @@ found:
+ 
+ 	return -EPERM;
+ }
++EXPORT_SYMBOL(__devcgroup_inode_permission);
+ 
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index d9e1533..466ee5c 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+ 
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		return 0;
+ 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL(security_path_link);
+ 
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 			 struct path *new_dir, struct dentry *new_dentry)
+@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path)
+ 		return 0;
+ 	return security_ops->path_truncate(path);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+ 
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 			mode_t mode)
+@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 		return 0;
+ 	return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+ 
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+ 
+ int security_path_chroot(struct path *path)
+ {
+@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -619,6 +627,7 @@ int security_file_permission(struct file *file, int mask)
+ 
+ 	return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -646,6 +655,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+ 
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ 			    unsigned long prot)

core/linux-orion/config

@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/arm 3.0 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 3.1.7-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -168,6 +168,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
 CONFIG_BLK_DEV_INTEGRITY=y
 
 #
@@ -224,6 +225,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_PRIMA2 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
@@ -239,7 +241,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
 CONFIG_ARCH_ORION5X=y
@@ -269,6 +270,7 @@ CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_ZYNQ is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 
@@ -978,6 +980,7 @@ CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
 
 #
 # Device Drivers
@@ -997,6 +1000,8 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -1126,6 +1131,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
+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
@@ -1164,6 +1170,7 @@ CONFIG_DS1682=m
 # CONFIG_TI_DAC7512 is not set
 # CONFIG_BMP085 is not set
 # CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_C2PORT=m
 
 #
@@ -1174,6 +1181,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1486,6 +1494,7 @@ CONFIG_ATL1C=m
 CONFIG_JME=m
 # CONFIG_STMMAC_ETH is not set
 # CONFIG_PCH_GBE is not set
+# CONFIG_FTGMAC100 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_TR=y
 CONFIG_IBMOL=m
@@ -1525,6 +1534,7 @@ CONFIG_ATH9K_RATE_CONTROL=y
 # CONFIG_ATH9K_HTC is not set
 # CONFIG_CARL9170 is not set
 CONFIG_B43=m
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PIO=y
@@ -1610,7 +1620,9 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_RTL8192CE is not set
 # CONFIG_RTL8192SE is not set
+CONFIG_RTL8192DE=m
 # CONFIG_RTL8192CU is not set
+CONFIG_RTLWIFI=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 # CONFIG_WL12XX_MENU is not set
@@ -1900,9 +1912,12 @@ CONFIG_TOUCHSCREEN_TSC2007=m
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
@@ -2102,7 +2117,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # Memory mapped GPIO drivers:
 #
-# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_VX855 is not set
 
@@ -2215,12 +2230,15 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 # CONFIG_SENSORS_LTC4261 is not set
 CONFIG_SENSORS_LM95241=m
+# CONFIG_SENSORS_LM95245 is not set
 CONFIG_SENSORS_MAX1111=m
 # CONFIG_SENSORS_MAX16065 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
 CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 CONFIG_SENSORS_PC87427=m
 # CONFIG_SENSORS_PCF8591 is not set
@@ -2236,7 +2254,9 @@ CONFIG_SENSORS_DME1737=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 CONFIG_SENSORS_SMSC47M192=m
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
 # CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
 # CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_ADS7871 is not set
@@ -2259,6 +2279,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627EHF=m
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -2313,6 +2334,9 @@ CONFIG_HTC_PASIC3=m
 CONFIG_TPS65010=m
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TC3589X is not set
@@ -2340,7 +2364,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -2370,6 +2394,7 @@ CONFIG_MEDIA_SUPPORT=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -2386,6 +2411,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IR_IMON is not set
 # CONFIG_IR_MCEUSB is not set
@@ -2409,6 +2435,7 @@ 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
@@ -2424,6 +2451,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=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
@@ -2487,6 +2517,10 @@ CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9V011=m
 
+#
+# Flash devices
+#
+
 #
 # Video improvement chips
 #
@@ -2547,6 +2581,7 @@ CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_SOC_CAMERA_OV2640 is not set
+# CONFIG_SOC_CAMERA_OV5642 is not set
 # CONFIG_SOC_CAMERA_OV6650 is not set
 CONFIG_SOC_CAMERA_OV772X=m
 # CONFIG_SOC_CAMERA_OV9640 is not set
@@ -2575,6 +2610,7 @@ CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_PAC207=m
 # CONFIG_USB_GSPCA_PAC7302 is not set
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 # CONFIG_USB_GSPCA_SN9C2028 is not set
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -2606,6 +2642,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 # CONFIG_VIDEO_TLG2300 is not set
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -2745,6 +2782,11 @@ CONFIG_DVB_HOPPER=m
 #
 # CONFIG_DVB_NGENE is not set
 
+#
+# Supported ddbridge ('Octopus') Adapters
+#
+# CONFIG_DVB_DDBRIDGE is not set
+
 #
 # Supported DVB Frontends
 #
@@ -2758,6 +2800,12 @@ 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
 #
@@ -3097,6 +3145,8 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_HID_EMS_FF is not set
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 # CONFIG_HID_KEYTOUCH is not set
 CONFIG_HID_KYE=m
 # CONFIG_HID_UCLOGIC is not set
@@ -3121,13 +3171,9 @@ CONFIG_HID_PETALYNX=m
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_ROCCAT_ARVO is not set
-# CONFIG_HID_ROCCAT_KONE is not set
-# CONFIG_HID_ROCCAT_KONEPLUS is not set
-# CONFIG_HID_ROCCAT_KOVAPLUS is not set
-# CONFIG_HID_ROCCAT_PYRA is not set
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -3185,11 +3231,6 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
 
-#
-# Enable Host or Gadget support to see Inventra options
-#
-# CONFIG_USB_MUSB_HDRC is not set
-
 #
 # USB Device Class drivers
 #
@@ -3208,6 +3249,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+# CONFIG_REALTEK_AUTOPM is not set
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3356,7 +3398,6 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_PCA9532=m
 # CONFIG_LEDS_PCA9532_GPIO is not set
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
@@ -3379,7 +3420,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-# CONFIG_NFC_DEVICES is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_INFINIBAND=m
@@ -3498,11 +3538,18 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
 CONFIG_STAGING=y
 # CONFIG_ET131X is not set
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_TM6000 is not set
+# CONFIG_DVB_CXD2099 is not set
 # CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
@@ -3535,7 +3582,6 @@ CONFIG_STAGING=y
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
-CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_FT1000 is not set
@@ -3561,12 +3607,10 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-
-#
-# Altera FPGA firmware download module
-#
 # CONFIG_ALTERA_STAPL is not set
 CONFIG_CLKSRC_MMIO=y
+CONFIG_IOMMU_SUPPORT=y
+# CONFIG_VIRT_DRIVERS is not set
 
 #
 # File systems
@@ -3721,6 +3765,7 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_ZLIB=y
 # CONFIG_SQUASHFS_LZO is not set
 # CONFIG_SQUASHFS_XZ is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -3741,8 +3786,28 @@ CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+CONFIG_ORE=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_AUFS_FS=y
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+CONFIG_AUFS_HNOTIFY=y
+CONFIG_AUFS_HFSNOTIFY=y
+# CONFIG_AUFS_EXPORT is not set
+CONFIG_AUFS_RDU=y
+# CONFIG_AUFS_PROC_MAP is not set
+CONFIG_AUFS_SP_IATTR=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+# CONFIG_AUFS_BR_HFSPLUS is not set
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -3754,7 +3819,6 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_DEPRECATED=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -3903,7 +3967,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -3991,6 +4055,11 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -4125,6 +4194,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+# CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -4155,3 +4225,4 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
+# CONFIG_CORDIC is not set

core/linux-orion/linux-orion.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-orion
-KERNEL_VERSION=3.0-orion
+KERNEL_VERSION=3.1.7-2-orion
 
 patch_kernel() {
   if [ -e "etc/machid.bin" ]; then
@@ -88,9 +88,8 @@ post_upgrade() {
 
   if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
     if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
-      echo "WARNING: /boot appears to be a seperate partition but is not mounted"
-      echo "         This is most likely not what you want.  Please mount your /boot"
-      echo "         partition and reinstall the kernel unless you are sure this is OK"
+      echo "WARNING: /boot appears to be a seperate partition but is not mounted."
+      echo "         You probably just broke your system. Congratulations."
     fi
   fi
 

core/linux-orion/support.patch

@@ -0,0 +1,10 @@
+--- a/drivers/usb/misc/sisusbvga/sisusb.c
++++ b/drivers/usb/misc/sisusbvga/sisusb.c
+@@ -3247,6 +3247,7 @@
+ 	{ USB_DEVICE(0x0711, 0x0903) },
+ 	{ USB_DEVICE(0x0711, 0x0918) },
+ 	{ USB_DEVICE(0x0711, 0x0920) },
++	{ USB_DEVICE(0x0711, 0x0950) },
+ 	{ USB_DEVICE(0x182d, 0x021c) },
+ 	{ USB_DEVICE(0x182d, 0x0269) },
+ 	{ }

core/linux-orion/usb-add-reset-resume-quirk-for-several-webcams.patch

@@ -0,0 +1,98 @@
+commit 2394d67e446bf616a0885167d5f0d397bdacfdfc
+Author: Oliver Neukum <oneukum@suse.de>
+Date:   Tue Sep 13 08:42:21 2011 +0200
+
+    USB: add RESET_RESUME for webcams shown to be quirky
+
+    The new runtime PM code has shown that many webcams suffer
+    from a race condition that may crash them upon resume.
+    Runtime PM is especially prone to show the problem because
+    it retains power to the cameras at all times. However
+    system suspension may also crash the devices and retain
+    power to the devices.
+    The only way to solve this problem without races is in
+    usbcore with the RESET_RESUME quirk.
+
+    Signed-off-by: Oliver Neukum <oneukum@suse.de>
+    Signed-off-by: stable <stable@kernel.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index 81ce6a8..38f0510 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {
+	/* Creative SB Audigy 2 NX */
+	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
+
++	/* Logitech Webcam C200 */
++	{ USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
++
++	/* Logitech Webcam C250 */
++	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
++
++	/* Logitech Webcam B/C500 */
++	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
++
++	/* Logitech Webcam Pro 9000 */
++	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
++
++	/* Logitech Webcam C310 */
++	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
++
++	/* Logitech Webcam C270 */
++	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
++
+	/* Logitech Harmony 700-series */
+	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
+
+@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+	{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
+			USB_QUIRK_CONFIG_INTF_STRINGS },
+
++	/* Guillemot Webcam Hercules Dualpix Exchange*/
++	{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
++
+	/* M-Systems Flash Disk Pioneers */
+	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+
+commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc
+Author: Jon Levell <linuxusb@coralbark.net>
+Date:   Thu Sep 29 20:42:52 2011 +0100
+
+    USB: add quirk for Logitech C300 web cam
+
+    My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound.
+    The following trivial patch fixes it.
+
+    Signed-off-by: Jon Levell <linuxusb@coralbark.net>
+    Cc: stable <stable@kernel.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index 38f0510..d6a8d82 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+	/* Logitech Webcam C250 */
+	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+
++	/* Logitech Webcam C300 */
++	{ USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
++
+	/* Logitech Webcam B/C500 */
+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index d6a8d82..caa1991 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+	/* Logitech Webcam B/C500 */
+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
+
++	/* Logitech Webcam C600 */
++	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
++
+	/* Logitech Webcam Pro 9000 */
+	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },