kernel: update 3.10 to 3.10.2

Also refresh 3.10 patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37502

1 files changed, 18 insertions, 26 deletions

diff --git a/target/linux/brcm2708/patches-3.10/012-bcm2708-sound-driver.patch b/target/linux/brcm2708/patches-3.10/012-bcm2708-sound-driver.patch
index d1f2eb4f06..9f5ff5879f 100644
--- a/target/linux/brcm2708/patches-3.10/012-bcm2708-sound-driver.patch
+++ b/target/linux/brcm2708/patches-3.10/012-bcm2708-sound-driver.patch
@@ -1,6 +1,5 @@
-diff -urN linux-3.10/sound/arm/bcm2835.c linux-rpi-3.10.y/sound/arm/bcm2835.c
---- linux-3.10/sound/arm/bcm2835.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/bcm2835.c	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/bcm2835.c
 @@ -0,0 +1,413 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -415,9 +414,8 @@ diff -urN linux-3.10/sound/arm/bcm2835.c linux-rpi-3.10.y/sound/arm/bcm2835.c
 +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:bcm2835_alsa");
-diff -urN linux-3.10/sound/arm/bcm2835-ctl.c linux-rpi-3.10.y/sound/arm/bcm2835-ctl.c
---- linux-3.10/sound/arm/bcm2835-ctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/bcm2835-ctl.c	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/bcm2835-ctl.c
 @@ -0,0 +1,200 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -619,9 +617,8 @@ diff -urN linux-3.10/sound/arm/bcm2835-ctl.c linux-rpi-3.10.y/sound/arm/bcm2835-
 +	}
 +	return 0;
 +}
-diff -urN linux-3.10/sound/arm/bcm2835.h linux-rpi-3.10.y/sound/arm/bcm2835.h
---- linux-3.10/sound/arm/bcm2835.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/bcm2835.h	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/bcm2835.h
 @@ -0,0 +1,157 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -780,9 +777,8 @@ diff -urN linux-3.10/sound/arm/bcm2835.h linux-rpi-3.10.y/sound/arm/bcm2835.h
 +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream);
 +
 +#endif /* __SOUND_ARM_BCM2835_H */
-diff -urN linux-3.10/sound/arm/bcm2835-pcm.c linux-rpi-3.10.y/sound/arm/bcm2835-pcm.c
---- linux-3.10/sound/arm/bcm2835-pcm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/bcm2835-pcm.c	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/bcm2835-pcm.c
 @@ -0,0 +1,426 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -1210,9 +1206,8 @@ diff -urN linux-3.10/sound/arm/bcm2835-pcm.c linux-rpi-3.10.y/sound/arm/bcm2835-
 +
 +	return 0;
 +}
-diff -urN linux-3.10/sound/arm/bcm2835-vchiq.c linux-rpi-3.10.y/sound/arm/bcm2835-vchiq.c
---- linux-3.10/sound/arm/bcm2835-vchiq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/bcm2835-vchiq.c	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/bcm2835-vchiq.c
 @@ -0,0 +1,879 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -2093,10 +2088,9 @@ diff -urN linux-3.10/sound/arm/bcm2835-vchiq.c linux-rpi-3.10.y/sound/arm/bcm283
 +
 +module_param(force_bulk, bool, 0444);
 +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio");
-diff -urN linux-3.10/sound/arm/Kconfig linux-rpi-3.10.y/sound/arm/Kconfig
---- linux-3.10/sound/arm/Kconfig	2013-06-30 23:13:29.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/Kconfig	2013-07-06 15:25:50.000000000 +0100
-@@ -39,5 +39,12 @@
+--- a/sound/arm/Kconfig
++++ b/sound/arm/Kconfig
+@@ -39,5 +39,12 @@ config SND_PXA2XX_AC97
  	  Say Y or M if you want to support any AC97 codec attached to
  	  the PXA2xx AC97 interface.
  
@@ -2109,10 +2103,9 @@ diff -urN linux-3.10/sound/arm/Kconfig linux-rpi-3.10.y/sound/arm/Kconfig
 +
  endif	# SND_ARM
  
-diff -urN linux-3.10/sound/arm/Makefile linux-rpi-3.10.y/sound/arm/Makefile
---- linux-3.10/sound/arm/Makefile	2013-06-30 23:13:29.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/Makefile	2013-07-06 15:25:50.000000000 +0100
-@@ -14,3 +14,9 @@
+--- a/sound/arm/Makefile
++++ b/sound/arm/Makefile
+@@ -14,3 +14,9 @@ snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_A
  
  obj-$(CONFIG_SND_PXA2XX_AC97)	+= snd-pxa2xx-ac97.o
  snd-pxa2xx-ac97-objs		:= pxa2xx-ac97.o
@@ -2122,9 +2115,8 @@ diff -urN linux-3.10/sound/arm/Makefile linux-rpi-3.10.y/sound/arm/Makefile
 +
 +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
 +
-diff -urN linux-3.10/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.10.y/sound/arm/vc_vchi_audioserv_defs.h
---- linux-3.10/sound/arm/vc_vchi_audioserv_defs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/sound/arm/vc_vchi_audioserv_defs.h	2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/sound/arm/vc_vchi_audioserv_defs.h
 @@ -0,0 +1,116 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.