From 7da4861c47bd6492c96d873382bca674b89dc252 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 17 May 2012 20:44:10 +0200 Subject: [PATCH] linux: update RPi patches Signed-off-by: Stephan Raue --- .../linux-3.1.10-601-RPi_support-0.1.patch | 579 +++++++++--------- 1 file changed, 284 insertions(+), 295 deletions(-) diff --git a/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch b/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch index 4e2cde5c7e..217c388129 100644 --- a/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch @@ -1,6 +1,6 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/divdi3.c linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c --- linux-3.1.10/arch/arm/boot/compressed/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c 2012-05-16 13:42:31.321716258 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c 2012-05-17 19:43:18.183586746 +0200 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -342,7 +342,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/divdi3.c linux-3.1.10.patch/arc +} diff -Naur linux-3.1.10/arch/arm/boot/compressed/longlong.h linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h --- linux-3.1.10/arch/arm/boot/compressed/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h 2012-05-16 13:42:31.322716276 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h 2012-05-17 19:43:18.184586766 +0200 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -497,7 +497,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/longlong.h linux-3.1.10.patch/a +#define udiv_qrnnd __udiv_qrnnd_c diff -Naur linux-3.1.10/arch/arm/boot/compressed/Makefile linux-3.1.10.patch/arch/arm/boot/compressed/Makefile --- linux-3.1.10/arch/arm/boot/compressed/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/Makefile 2012-05-16 13:42:31.312716099 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/Makefile 2012-05-17 19:43:18.182586726 +0200 @@ -121,11 +121,17 @@ LDFLAGS_vmlinux += -T @@ -519,7 +519,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/Makefile linux-3.1.10.patch/arc # independently from the rest at run time. This can be achieved by diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-05-16 13:42:31.632721724 +0200 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-05-17 19:43:18.408591275 +0200 @@ -0,0 +1,494 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1017,7 +1017,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1.10.p +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig 2012-05-16 13:42:31.633721742 +0200 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig 2012-05-17 19:43:18.409591295 +0200 @@ -0,0 +1,530 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1551,7 +1551,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_defconfig linux-3.1.10.patch/arc +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-05-16 13:42:31.640721865 +0200 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-05-17 19:43:18.417591456 +0200 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2087,7 +2087,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/Kconfig linux-3.1.10.patch/arch/arm/Kconfig --- linux-3.1.10/arch/arm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/Kconfig 2012-05-16 13:42:31.263715240 +0200 ++++ linux-3.1.10.patch/arch/arm/Kconfig 2012-05-17 19:43:18.181586706 +0200 @@ -896,6 +896,19 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2118,7 +2118,7 @@ diff -Naur linux-3.1.10/arch/arm/Kconfig linux-3.1.10.patch/arch/arm/Kconfig config ARCH_ACORN diff -Naur linux-3.1.10/arch/arm/kernel/armksyms.c linux-3.1.10.patch/arch/arm/kernel/armksyms.c --- linux-3.1.10/arch/arm/kernel/armksyms.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/kernel/armksyms.c 2012-05-16 13:42:31.424718073 +0200 ++++ linux-3.1.10.patch/arch/arm/kernel/armksyms.c 2012-05-17 19:43:18.212587330 +0200 @@ -46,6 +46,8 @@ extern void __aeabi_uidiv(void); extern void __aeabi_uidivmod(void); @@ -2139,7 +2139,7 @@ diff -Naur linux-3.1.10/arch/arm/kernel/armksyms.c linux-3.1.10.patch/arch/arm/k /* bitops */ diff -Naur linux-3.1.10/arch/arm/lib/divdi3.c linux-3.1.10.patch/arch/arm/lib/divdi3.c --- linux-3.1.10/arch/arm/lib/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/divdi3.c 2012-05-16 13:42:31.445718437 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/divdi3.c 2012-05-17 19:43:18.214587371 +0200 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -2481,7 +2481,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/divdi3.c linux-3.1.10.patch/arch/arm/lib/di +} diff -Naur linux-3.1.10/arch/arm/lib/lib1funcs.S linux-3.1.10.patch/arch/arm/lib/lib1funcs.S --- linux-3.1.10/arch/arm/lib/lib1funcs.S 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/lib1funcs.S 2012-05-16 13:42:31.446718455 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/lib1funcs.S 2012-05-17 19:43:18.215587391 +0200 @@ -349,6 +349,33 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) @@ -2518,7 +2518,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/lib1funcs.S linux-3.1.10.patch/arch/arm/lib Ldiv0: diff -Naur linux-3.1.10/arch/arm/lib/longlong.h linux-3.1.10.patch/arch/arm/lib/longlong.h --- linux-3.1.10/arch/arm/lib/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/longlong.h 2012-05-16 13:42:31.447718473 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/longlong.h 2012-05-17 19:43:18.216587411 +0200 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -2673,7 +2673,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/longlong.h linux-3.1.10.patch/arch/arm/lib/ +#define udiv_qrnnd __udiv_qrnnd_c diff -Naur linux-3.1.10/arch/arm/lib/Makefile linux-3.1.10.patch/arch/arm/lib/Makefile --- linux-3.1.10/arch/arm/lib/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/Makefile 2012-05-16 13:42:31.437718297 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/Makefile 2012-05-17 19:43:18.213587351 +0200 @@ -13,7 +13,8 @@ testchangebit.o testclearbit.o testsetbit.o \ ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ @@ -2686,7 +2686,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/Makefile linux-3.1.10.patch/arch/arm/lib/Ma diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c --- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c 2012-05-16 13:42:31.449718509 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c 2012-05-17 19:43:18.224587571 +0200 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -3089,7 +3089,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c linux-3.1.10.patch/arch/ +} diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h --- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h 2012-05-16 13:42:31.449718509 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h 2012-05-17 19:43:18.224587571 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -3120,7 +3120,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h linux-3.1.10.patch/arch/ +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-05-16 13:42:31.634721759 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-05-17 19:43:18.432591758 +0200 @@ -0,0 +1,649 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3738,7 +3738,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/ + .gpio = 16, + .name = "led0", + .default_trigger = "mmc0", -+ .active_low = 0, ++ .active_low = 1, + }, +}; + @@ -3773,7 +3773,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/ +module_param(serial, uint, 0644); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-05-16 13:42:31.451718543 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-05-17 19:43:18.227587631 +0200 @@ -0,0 +1,323 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4100,7 +4100,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.1.10.patch/ + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-05-16 13:42:31.450718526 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-05-17 19:43:18.226587611 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4155,7 +4155,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h linux-3.1.10.patch/arch/ +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.c linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c --- linux-3.1.10/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c 2012-05-16 13:42:31.452718560 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c 2012-05-17 19:43:18.227587631 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4220,7 +4220,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.c linux-3.1.10.patch/arch/ar +EXPORT_SYMBOL(clk_set_rate); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.h linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h --- linux-3.1.10/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h 2012-05-16 13:42:31.452718560 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h 2012-05-17 19:43:18.227587631 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4248,7 +4248,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.h linux-3.1.10.patch/arch/ar +}; diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/dma.c linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c --- linux-3.1.10/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c 2012-05-16 13:42:31.453718577 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c 2012-05-17 19:43:18.228587651 +0200 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4649,7 +4649,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/dma.c linux-3.1.10.patch/arch/arm/ +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-05-16 13:42:31.455718613 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-05-17 19:43:18.229587671 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5072,7 +5072,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-05-16 13:42:31.455718613 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-05-17 19:43:18.230587691 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5136,7 +5136,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.1 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-05-16 13:42:31.455718613 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-05-17 19:43:18.230587691 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5147,7 +5147,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-05-16 13:42:31.456718631 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-05-17 19:43:18.231587711 +0200 @@ -0,0 +1,24 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5175,7 +5175,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3 +#include diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-05-16 13:42:31.456718631 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-05-17 19:43:18.231587711 +0200 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5263,7 +5263,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.1.10.pa +#endif /* _MACH_BCM2708_DMA_H */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-05-16 13:42:31.456718631 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-05-17 19:43:18.232587732 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5336,7 +5336,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3 + .endm diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-05-16 13:42:31.457718649 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-05-17 19:43:18.232587732 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5378,7 +5378,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.1.10.pa +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-05-16 13:42:31.457718649 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-05-17 19:43:18.232587732 +0200 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5430,7 +5430,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-05-16 13:42:31.458718667 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-05-17 19:43:18.233587752 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5462,7 +5462,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.1. +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-05-16 13:42:31.458718667 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-05-17 19:43:18.233587752 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5494,7 +5494,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-05-16 13:42:31.459718684 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-05-17 19:43:18.234587772 +0200 @@ -0,0 +1,190 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5688,7 +5688,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1.10.p +#endif /* _BCM2708_IRQS_H_ */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-05-16 13:42:31.459718684 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-05-17 19:43:18.234587772 +0200 @@ -0,0 +1,185 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5877,7 +5877,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.1 +#define NR_IRQS (64 + 21) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-05-16 13:42:31.586720915 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-05-17 19:43:18.426591638 +0200 @@ -0,0 +1,64 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5913,7 +5913,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10 +/* + * Physical DRAM offset. + */ -+#define PHYS_OFFSET UL(0x00000000) ++#define PLAT_PHYS_OFFSET UL(0x00000000) +#define ARMMEM_OFFSET UL(0x00000000) /* offset in VC of ARM memory */ + +#ifdef CONFIG_BCM2708_NOL2CACHE @@ -5932,8 +5932,8 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10 +#define BUS_OFFSET (ARMMEM_OFFSET + _REAL_BUS_OFFSET) +#define __virt_to_bus(x) ((x) + (BUS_OFFSET - PAGE_OFFSET)) +#define __bus_to_virt(x) ((x) - (BUS_OFFSET - PAGE_OFFSET)) -+#define __pfn_to_bus(x) (__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET)) -+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET)) ++#define __pfn_to_bus(x) (__pfn_to_phys(x) + (BUS_OFFSET - PLAT_PHYS_OFFSET)) ++#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +/* + * Consistent DMA area set to 2M. Framebuffer now allocated on host @@ -5945,7 +5945,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-05-16 13:42:31.461718718 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-05-17 19:43:18.236587812 +0200 @@ -0,0 +1,210 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6159,7 +6159,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.1. +/* END */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig 2012-05-16 13:42:31.461718718 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig 2012-05-17 19:43:18.236587812 +0200 @@ -0,0 +1,210 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6373,7 +6373,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux +/* END */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-05-16 13:42:31.462718736 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-05-17 19:43:18.237587832 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6403,7 +6403,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1.10. +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-05-16 13:42:31.462718736 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-05-17 19:43:18.237587832 +0200 @@ -0,0 +1,53 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6460,7 +6460,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-05-16 13:42:31.462718736 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-05-17 19:43:18.237587832 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6487,7 +6487,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1.10. +#define CLOCK_TICK_RATE (1000000) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-05-16 13:42:31.463718754 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-05-17 19:43:18.238587852 +0200 @@ -0,0 +1,49 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6540,7 +6540,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3. +#define arch_decomp_wdog() diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-05-16 13:42:31.464718772 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-05-17 19:43:18.239587872 +0200 @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6586,7 +6586,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-05-16 13:42:31.624721583 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-05-17 19:43:18.400591113 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6625,7 +6625,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.1.10 + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-05-16 13:42:31.464718772 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-05-17 19:43:18.239587872 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6649,7 +6649,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.1.1 +#define VMALLOC_END (0xd8000000) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Kconfig linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig --- linux-3.1.10/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig 2012-05-16 13:42:31.586720915 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig 2012-05-17 19:43:18.362590348 +0200 @@ -0,0 +1,32 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6685,7 +6685,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Kconfig linux-3.1.10.patch/arch/ar +endmenu diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile --- linux-3.1.10/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile 2012-05-16 13:42:31.447718473 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile 2012-05-17 19:43:18.223587551 +0200 @@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. @@ -6697,15 +6697,15 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile linux-3.1.10.patch/arch/a + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-05-16 13:42:31.448718491 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-05-17 19:43:18.223587551 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c --- linux-3.1.10/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c 2012-05-16 13:42:31.591721004 +0200 -@@ -0,0 +1,195 @@ ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c 2012-05-17 19:43:18.425591617 +0200 +@@ -0,0 +1,193 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c + * @@ -6805,8 +6805,6 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/ar + bcm_mailbox_write(MBOX_CHAN_POWER, + global_request << 4); + -+ /* Wait for a response during power-up */ -+ mdelay(10); + if (global_request & ~g_state.global_request) { + rc = bcm_mailbox_read(MBOX_CHAN_POWER, + &actual); @@ -6903,8 +6901,8 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/ar +MODULE_LICENSE("GPL"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c --- linux-3.1.10/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c 2012-05-16 13:42:31.466718807 +0200 -@@ -0,0 +1,309 @@ ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c 2012-05-17 19:43:18.425591617 +0200 +@@ -0,0 +1,308 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c + * @@ -7026,8 +7024,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm + if (mbox->magic != MBOX_MAGIC) + rc = -EINVAL; + else { -+ if (mbox->msg[chan] || -+ (down_interruptible(&mbox->sema[chan]) == 0)) { ++ if (down_interruptible(&mbox->sema[chan]) == 0) { + *data28 = MBOX_DATA28(mbox->msg[chan]); + mbox->msg[chan] = 0; + rc = 0; @@ -7216,7 +7213,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm +MODULE_ALIAS("platform:bcm-mbox"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-05-16 13:42:31.627721636 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-05-17 19:43:18.403591175 +0200 @@ -0,0 +1,466 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7686,7 +7683,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c linux-3.1.10.patch/arch/a +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.1.10/arch/arm/Makefile linux-3.1.10.patch/arch/arm/Makefile --- linux-3.1.10/arch/arm/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/Makefile 2012-05-16 13:42:31.266715291 +0200 ++++ linux-3.1.10.patch/arch/arm/Makefile 2012-05-17 19:43:18.182586726 +0200 @@ -196,6 +196,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -7697,7 +7694,7 @@ diff -Naur linux-3.1.10/arch/arm/Makefile linux-3.1.10.patch/arch/arm/Makefile # by CONFIG_* macro name. diff -Naur linux-3.1.10/arch/arm/mm/alignment.c linux-3.1.10.patch/arch/arm/mm/alignment.c --- linux-3.1.10/arch/arm/mm/alignment.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/alignment.c 2012-05-16 13:42:31.468718841 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/alignment.c 2012-05-17 19:43:18.243587954 +0200 @@ -855,9 +855,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -7714,7 +7711,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/alignment.c linux-3.1.10.patch/arch/arm/mm/a goto bad; diff -Naur linux-3.1.10/arch/arm/mm/Kconfig linux-3.1.10.patch/arch/arm/mm/Kconfig --- linux-3.1.10/arch/arm/mm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/Kconfig 2012-05-16 13:42:31.467718824 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/Kconfig 2012-05-17 19:43:18.242587934 +0200 @@ -390,7 +390,7 @@ # ARMv6 @@ -7726,7 +7723,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/Kconfig linux-3.1.10.patch/arch/arm/mm/Kconf select CPU_PABRT_V6 diff -Naur linux-3.1.10/arch/arm/mm/proc-v6.S linux-3.1.10.patch/arch/arm/mm/proc-v6.S --- linux-3.1.10/arch/arm/mm/proc-v6.S 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/proc-v6.S 2012-05-16 13:42:31.475718965 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/proc-v6.S 2012-05-17 19:43:18.243587954 +0200 @@ -70,10 +70,19 @@ * * IRQs are already disabled. @@ -7752,7 +7749,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/proc-v6.S linux-3.1.10.patch/arch/arm/mm/pro ENTRY(cpu_v6_dcache_clean_area) diff -Naur linux-3.1.10/drivers/misc/Kconfig linux-3.1.10.patch/drivers/misc/Kconfig --- linux-3.1.10/drivers/misc/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/Kconfig 2012-05-16 13:42:31.498719369 +0200 ++++ linux-3.1.10.patch/drivers/misc/Kconfig 2012-05-17 19:43:18.280588698 +0200 @@ -507,5 +507,6 @@ source "drivers/misc/ti-st/Kconfig" source "drivers/misc/lis3lv02d/Kconfig" @@ -7762,7 +7759,7 @@ diff -Naur linux-3.1.10/drivers/misc/Kconfig linux-3.1.10.patch/drivers/misc/Kco endif # MISC_DEVICES diff -Naur linux-3.1.10/drivers/misc/Makefile linux-3.1.10.patch/drivers/misc/Makefile --- linux-3.1.10/drivers/misc/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/Makefile 2012-05-16 13:42:31.498719369 +0200 ++++ linux-3.1.10.patch/drivers/misc/Makefile 2012-05-17 19:43:18.281588718 +0200 @@ -47,3 +47,4 @@ obj-y += lis3lv02d/ obj-y += carma/ @@ -7770,7 +7767,7 @@ diff -Naur linux-3.1.10/drivers/misc/Makefile linux-3.1.10.patch/drivers/misc/Ma +obj-y += vc04_services/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-05-16 13:42:31.597721109 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-05-17 19:43:18.372590550 +0200 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8083,7 +8080,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/co +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-05-16 13:42:31.597721109 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-05-17 19:43:18.373590570 +0200 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8273,7 +8270,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_driver +/****************************** End of file ***********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-05-16 13:42:31.599721144 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-05-17 19:43:18.375590610 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8491,7 +8488,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-05-16 13:42:31.599721144 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-05-17 19:43:18.375590610 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8551,7 +8548,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +#endif /*VCHI_CFG_INTERNAL_H_*/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-05-16 13:42:31.600721161 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-05-17 19:43:18.376590630 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8707,7 +8704,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h +#endif // VCHI_COMMON_H_ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-05-16 13:42:31.598721127 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-05-17 19:43:18.374590590 +0200 @@ -0,0 +1,347 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9058,7 +9055,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3 +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-05-16 13:42:31.553720335 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-05-17 19:43:18.329589685 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -9089,7 +9086,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-05-16 13:42:31.601721178 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-05-17 19:43:18.377590650 +0200 @@ -0,0 +1,512 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9605,7 +9602,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-05-16 13:42:31.500719403 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-05-17 19:43:18.283588758 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9636,7 +9633,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#endif /* VCHIQ_2835_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-05-16 13:42:31.635721776 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-05-17 19:43:18.411591335 +0200 @@ -0,0 +1,1912 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11552,7 +11549,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-05-16 13:42:31.603721214 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-05-17 19:43:18.379590691 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11674,7 +11671,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +#endif /* VCHIQ_ARM_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-05-16 13:42:31.504719475 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-05-17 19:43:18.287588839 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11721,7 +11718,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif /* VCHIQ_CFG_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-05-16 13:42:31.504719475 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-05-17 19:43:18.287588839 +0200 @@ -0,0 +1,101 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -11826,7 +11823,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +EXPORT_SYMBOL( vchiq_add_connected_callback ); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-05-16 13:42:31.505719492 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-05-17 19:43:18.288588859 +0200 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -11862,7 +11859,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-05-16 13:42:31.636721793 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-05-17 19:43:18.412591355 +0200 @@ -0,0 +1,2717 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14583,7 +14580,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-05-16 13:42:31.637721811 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-05-17 19:43:18.414591395 +0200 @@ -0,0 +1,506 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15093,7 +15090,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-05-16 13:42:31.500719403 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-05-17 19:43:18.283588758 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15124,7 +15121,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-05-16 13:42:31.607721284 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-05-17 19:43:18.383590772 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15283,7 +15280,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +#endif /* VCHIQ_IF_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-05-16 13:42:31.637721811 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-05-17 19:43:18.414591395 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15392,7 +15389,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-05-16 13:42:31.512719616 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-05-17 19:43:18.295589000 +0200 @@ -0,0 +1,297 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -15693,7 +15690,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +EXPORT_SYMBOL(vchiq_open_service_params); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-05-16 13:42:31.608721301 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-05-17 19:43:18.384590792 +0200 @@ -0,0 +1,1628 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17325,7 +17322,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-05-16 13:42:31.514719650 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-05-17 19:43:18.298589060 +0200 @@ -0,0 +1,45 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -17374,7 +17371,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-05-16 13:42:31.515719667 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-05-17 19:43:18.298589060 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17421,7 +17418,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +#endif /* VCHIQ_PAGELIST_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-05-16 13:42:31.609721319 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-05-17 19:43:18.385590812 +0200 @@ -0,0 +1,1001 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18426,7 +18423,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-05-16 13:42:31.524719826 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-05-17 19:43:18.300589100 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18527,7 +18524,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-05-16 13:42:31.525719844 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-05-17 19:43:18.301589120 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18578,7 +18575,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-05-16 13:42:31.526719861 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-05-17 19:43:18.302589141 +0200 @@ -0,0 +1,681 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -19263,7 +19260,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-05-16 13:42:31.554720353 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-05-17 19:43:18.330589705 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19354,7 +19351,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-05-16 13:42:31.554720353 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-05-17 19:43:18.330589705 +0200 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19629,7 +19626,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-05-16 13:42:31.555720371 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-05-17 19:43:18.331589725 +0200 @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19944,7 +19941,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-05-16 13:42:31.555720371 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-05-17 19:43:18.331589725 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20066,7 +20063,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-05-16 13:42:31.556720389 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-05-17 19:43:18.332589745 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20162,7 +20159,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-05-16 13:42:31.556720389 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-05-17 19:43:18.332589745 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20252,7 +20249,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-05-16 13:42:31.557720406 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-05-17 19:43:18.333589765 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20342,7 +20339,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-05-16 13:42:31.557720406 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-05-17 19:43:18.333589765 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20501,7 +20498,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-05-16 13:42:31.558720423 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-05-17 19:43:18.334589785 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20719,7 +20716,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_j +#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-05-16 13:42:31.558720423 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-05-17 19:43:18.334589785 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20782,7 +20779,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-05-16 13:42:31.559720440 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-05-17 19:43:18.335589805 +0200 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21346,7 +21343,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-05-16 13:42:31.559720440 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-05-17 19:43:18.335589805 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21434,7 +21431,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-05-16 13:42:31.560720458 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-05-17 19:43:18.336589825 +0200 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21503,7 +21500,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-05-16 13:42:31.560720458 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-05-17 19:43:18.336589825 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21586,7 +21583,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-05-16 13:42:31.561720476 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-05-17 19:43:18.337589845 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21636,7 +21633,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_t + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-05-16 13:42:31.561720476 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-05-17 19:43:18.337589845 +0200 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21671,7 +21668,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/st +#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-05-16 13:42:31.562720494 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-05-17 19:43:18.338589865 +0200 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22302,7 +22299,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +EXPORT_SYMBOL( vcos_strdup ); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-05-16 13:42:31.537720054 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-05-17 19:43:18.312589342 +0200 @@ -0,0 +1,332 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22638,7 +22635,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-05-16 13:42:31.562720494 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-05-17 19:43:18.338589865 +0200 @@ -0,0 +1,111 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22753,7 +22750,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +// ############################################################################# diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-05-16 13:42:31.537720054 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-05-17 19:43:18.313589362 +0200 @@ -0,0 +1,64 @@ +/***************************************************************************** +* Copyright 2006 - 2008 Broadcom Corporation. All rights reserved. @@ -22821,7 +22818,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-05-16 13:42:31.563720512 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-05-17 19:43:18.339589885 +0200 @@ -0,0 +1,507 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23332,7 +23329,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-05-16 13:42:31.563720512 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-05-17 19:43:18.339589885 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23394,7 +23391,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-05-16 13:42:31.539720089 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-05-17 19:43:18.315589402 +0200 @@ -0,0 +1,129 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -23527,7 +23524,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-05-16 13:42:31.540720107 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-05-17 19:43:18.315589402 +0200 @@ -0,0 +1,39 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -23570,7 +23567,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#endif /*VCOS_THREAD_MAP_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-05-16 13:42:31.564720529 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-05-17 19:43:18.340589905 +0200 @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23854,7 +23851,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +#endif /* VCOS_ASSERT_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-05-16 13:42:31.565720546 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-05-17 19:43:18.341589926 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23941,7 +23938,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_fl +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-05-16 13:42:31.565720546 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-05-17 19:43:18.341589926 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23968,7 +23965,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_inf + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-05-16 13:42:31.542720143 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-05-17 19:43:18.318589463 +0200 @@ -0,0 +1,113 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -24085,7 +24082,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-05-16 13:42:31.543720160 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-05-17 19:43:18.319589483 +0200 @@ -0,0 +1,98 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -24187,7 +24184,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-05-16 13:42:31.566720563 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-05-17 19:43:18.342589947 +0200 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24231,7 +24228,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-05-16 13:42:31.566720563 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-05-17 19:43:18.342589947 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24315,7 +24312,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-05-16 13:42:31.567720581 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-05-17 19:43:18.343589967 +0200 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24428,7 +24425,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_fla + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-05-16 13:42:31.566720563 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-05-17 19:43:18.342589947 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24540,7 +24537,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-05-16 13:42:31.564720529 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-05-17 19:43:18.340589905 +0200 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24756,7 +24753,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3 + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-05-16 13:42:31.567720581 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-05-17 19:43:18.343589967 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24814,7 +24811,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h li + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-05-16 13:42:31.568720599 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-05-17 19:43:18.344589987 +0200 @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25108,7 +25105,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-05-16 13:42:31.568720599 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-05-17 19:43:18.344589987 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25230,7 +25227,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_ + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-05-16 13:42:31.569720617 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-05-17 19:43:18.345590007 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25326,7 +25323,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-05-16 13:42:31.570720635 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-05-17 19:43:18.345590007 +0200 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25498,7 +25495,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue. + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-05-16 13:42:31.570720635 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-05-17 19:43:18.346590027 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25605,7 +25602,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-05-16 13:42:31.570720635 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-05-17 19:43:18.346590027 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25662,7 +25659,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h li + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-05-16 13:42:31.571720652 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-05-17 19:43:18.347590047 +0200 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25792,7 +25789,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-05-16 13:42:31.571720652 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-05-17 19:43:18.347590047 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25830,7 +25827,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-05-16 13:42:31.572720669 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-05-17 19:43:18.348590067 +0200 @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26037,7 +26034,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-05-16 13:42:31.572720669 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-05-17 19:43:18.348590067 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26125,7 +26122,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-05-16 13:42:31.573720686 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-05-17 19:43:18.349590087 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26216,7 +26213,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_at +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-05-16 13:42:31.573720686 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-05-17 19:43:18.349590087 +0200 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26490,7 +26487,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-05-16 13:42:31.574720704 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-05-17 19:43:18.350590107 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26600,7 +26597,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-05-16 13:42:31.574720704 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-05-17 19:43:18.350590107 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26815,7 +26812,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/Kconfig linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig --- linux-3.1.10/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig 2012-05-16 13:42:31.498719369 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig 2012-05-17 19:43:18.281588718 +0200 @@ -0,0 +1,7 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -26826,7 +26823,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/Kconfig linux-3.1.10.patch/dr + diff -Naur linux-3.1.10/drivers/misc/vc04_services/Makefile linux-3.1.10.patch/drivers/misc/vc04_services/Makefile --- linux-3.1.10/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/Makefile 2012-05-16 13:42:31.595721073 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Makefile 2012-05-17 19:43:18.371590530 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -26851,7 +26848,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/Makefile linux-3.1.10.patch/d + diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.c linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c --- linux-3.1.10/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c 2012-05-16 13:42:31.478719017 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c 2012-05-17 19:43:18.246588014 +0200 @@ -0,0 +1,889 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -27744,7 +27741,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.c linux-3.1.10.patch/driver +MODULE_ALIAS("platform:bcm2708_mci"); diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.h linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h --- linux-3.1.10/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h 2012-05-16 13:42:31.479719034 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h 2012-05-17 19:43:18.246588014 +0200 @@ -0,0 +1,101 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -27849,7 +27846,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.h linux-3.1.10.patch/driver +} diff -Naur linux-3.1.10/drivers/mmc/host/Kconfig linux-3.1.10.patch/drivers/mmc/host/Kconfig --- linux-3.1.10/drivers/mmc/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/Kconfig 2012-05-16 13:42:31.476718982 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/Kconfig 2012-05-17 19:43:18.244587974 +0200 @@ -229,6 +229,27 @@ YMMV. @@ -27895,7 +27892,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/Kconfig linux-3.1.10.patch/drivers/mmc/ bool "Atmel MCI DMA support" diff -Naur linux-3.1.10/drivers/mmc/host/Makefile linux-3.1.10.patch/drivers/mmc/host/Makefile --- linux-3.1.10/drivers/mmc/host/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/Makefile 2012-05-16 13:42:31.477719000 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/Makefile 2012-05-17 19:43:18.244587974 +0200 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -27914,8 +27911,8 @@ diff -Naur linux-3.1.10/drivers/mmc/host/Makefile linux-3.1.10.patch/drivers/mmc obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-16 13:42:31.644721934 +0200 -@@ -0,0 +1,1564 @@ ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-17 19:43:18.427591658 +0200 +@@ -0,0 +1,1555 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 + * Copyright (c) 2010 Broadcom @@ -28814,8 +28811,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + We get CRC and DEND errors unless we wait for + the SD controller to finish reading/writing to the card. */ + u32 state_mask; -+ int timeout=1000000; -+ hptime_t now = hptime(); ++ int timeout=1000; + + DBG("PDMA over - sync card\n"); + if (data->flags & MMC_DATA_READ) @@ -28823,17 +28819,12 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + else + state_mask = SDHCI_DOING_WRITE; + -+ while (0 != (sdhci_bcm2708_raw_readl(host, -+ SDHCI_PRESENT_STATE) & -+ state_mask) && --timeout > 0) ++ while (0 != (sdhci_bcm2708_raw_readl(host, SDHCI_PRESENT_STATE) ++ & state_mask) && --timeout > 0) ++ { ++ udelay(100); + continue; -+ -+ if (1000000-timeout > 4000) /*ave. is about 3250*/ -+ DBG("%s: note - long %s sync %luns - " -+ "%d its.\n", -+ mmc_hostname(host->mmc), -+ data->flags & MMC_DATA_READ? "read": "write", -+ since_ns(now), 1000000-timeout); ++ } + if (timeout <= 0) + printk(KERN_ERR"%s: final %s to SD card still " + "running\n", @@ -29211,10 +29202,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + +static unsigned int sdhci_bcm2708_missing_status(struct sdhci_host *host) +{ -+ if(host->last_cmdop == MMC_SEND_STATUS) -+ return 1; -+ else -+ return 0; ++ return 1; +} + +/***************************************************************************** \ @@ -29482,7 +29470,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/host/sdhci.c --- linux-3.1.10/drivers/mmc/host/sdhci.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci.c 2012-05-16 13:42:31.645721952 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.c 2012-05-17 19:43:18.431591738 +0200 @@ -16,15 +16,18 @@ #include #include @@ -29833,19 +29821,20 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } /* -@@ -942,6 +967,11 @@ +@@ -942,6 +967,12 @@ if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY)) mask |= SDHCI_DATA_INHIBIT; + if(host->ops->missing_status && (cmd->opcode == MMC_SEND_STATUS)) { -+ timeout = 100; ++ timeout = 5000; // Really obscenely large delay to send the status, due to bug in controller ++ // which might cause the STATUS command to get stuck when a data operation is in flow + mask |= SDHCI_DATA_INHIBIT; + } + /* We shouldn't wait for data inihibit for stop commands, even though they might use busy signaling */ if (host->mrq->data && (cmd == host->mrq->data->stop)) -@@ -949,7 +979,7 @@ +@@ -949,7 +980,7 @@ while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { if (timeout == 0) { @@ -29854,7 +29843,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "inhibit bit(s).\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); cmd->error = -EIO; -@@ -959,10 +989,16 @@ +@@ -959,10 +990,16 @@ timeout--; mdelay(1); } @@ -29871,7 +29860,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ sdhci_prepare_data(host, cmd); -@@ -971,7 +1007,7 @@ +@@ -971,7 +1008,7 @@ sdhci_set_transfer_mode(host, cmd); if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) { @@ -29880,7 +29869,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc)); cmd->error = -EINVAL; tasklet_schedule(&host->finish_tasklet); -@@ -1121,7 +1157,7 @@ +@@ -1121,7 +1158,7 @@ while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) & SDHCI_CLOCK_INT_STABLE)) { if (timeout == 0) { @@ -29889,7 +29878,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "stabilised.\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); return; -@@ -1195,6 +1231,35 @@ +@@ -1195,6 +1232,35 @@ mdelay(10); } @@ -29925,7 +29914,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /*****************************************************************************\ * * * MMC callbacks * -@@ -1209,6 +1274,8 @@ +@@ -1209,6 +1275,8 @@ host = mmc_priv(mmc); @@ -29934,7 +29923,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ spin_lock_irqsave(&host->lock, flags); WARN_ON(host->mrq != NULL); -@@ -1269,13 +1336,11 @@ +@@ -1269,13 +1337,11 @@ spin_unlock_irqrestore(&host->lock, flags); } @@ -29950,7 +29939,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ spin_lock_irqsave(&host->lock, flags); -@@ -1334,7 +1399,7 @@ +@@ -1334,7 +1400,7 @@ else ctrl &= ~SDHCI_CTRL_HISPD; @@ -29959,7 +29948,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ u16 clk, ctrl_2; unsigned int clock; -@@ -1424,9 +1489,24 @@ +@@ -1424,9 +1490,24 @@ out: mmiowb(); spin_unlock_irqrestore(&host->lock, flags); @@ -29985,7 +29974,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ { unsigned long flags; int is_readonly; -@@ -1450,19 +1530,16 @@ +@@ -1450,19 +1531,16 @@ #define SAMPLE_COUNT 5 @@ -30008,7 +29997,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (++ro_count > SAMPLE_COUNT / 2) return 1; } -@@ -1471,38 +1548,64 @@ +@@ -1471,38 +1549,64 @@ return 0; } @@ -30083,7 +30072,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* * Signal Voltage Switching is only applicable for Host Controllers * v3.00 and above. -@@ -1528,7 +1631,7 @@ +@@ -1528,7 +1632,7 @@ if (!(ctrl & SDHCI_CTRL_VDD_180)) return 0; else { @@ -30092,7 +30081,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "signalling voltage failed\n"); return -EIO; } -@@ -1587,7 +1690,7 @@ +@@ -1587,7 +1691,7 @@ pwr |= SDHCI_POWER_ON; sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); @@ -30101,7 +30090,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "voltage failed, retrying with S18R set to 0\n"); return -EAGAIN; } else -@@ -1595,6 +1698,20 @@ +@@ -1595,6 +1699,20 @@ return 0; } @@ -30122,7 +30111,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ static int sdhci_execute_tuning(struct mmc_host *mmc) { struct sdhci_host *host; -@@ -1606,6 +1723,7 @@ +@@ -1606,6 +1724,7 @@ host = mmc_priv(mmc); @@ -30130,7 +30119,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ disable_irq(host->irq); spin_lock(&host->lock); -@@ -1623,6 +1741,7 @@ +@@ -1623,6 +1742,7 @@ else { spin_unlock(&host->lock); enable_irq(host->irq); @@ -30138,7 +30127,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return 0; } -@@ -1648,7 +1767,7 @@ +@@ -1648,7 +1768,7 @@ timeout = 150; do { struct mmc_command cmd = {0}; @@ -30147,7 +30136,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (!tuning_loop_counter && !timeout) break; -@@ -1694,7 +1813,7 @@ +@@ -1694,7 +1814,7 @@ spin_lock(&host->lock); if (!host->tuning_done) { @@ -30156,7 +30145,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "Buffer Read Ready interrupt during tuning " "procedure, falling back to fixed sampling " "clock\n"); -@@ -1724,7 +1843,7 @@ +@@ -1724,7 +1844,7 @@ sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); } else { if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) { @@ -30165,7 +30154,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ " failed, falling back to fixed sampling" " clock\n"); err = -EIO; -@@ -1766,18 +1885,16 @@ +@@ -1766,18 +1886,16 @@ sdhci_clear_set_irqs(host, SDHCI_INT_DATA_AVAIL, ier); spin_unlock(&host->lock); enable_irq(host->irq); @@ -30186,7 +30175,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* Host Controller v3.00 defines preset value registers */ if (host->version < SDHCI_SPEC_300) return; -@@ -1793,22 +1910,36 @@ +@@ -1793,22 +1911,36 @@ if (enable && !(ctrl & SDHCI_CTRL_PRESET_VAL_ENABLE)) { ctrl |= SDHCI_CTRL_PRESET_VAL_ENABLE; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); @@ -30223,7 +30212,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ }; /*****************************************************************************\ -@@ -1826,19 +1957,19 @@ +@@ -1826,19 +1958,19 @@ spin_lock_irqsave(&host->lock, flags); @@ -30254,7 +30243,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } spin_unlock_irqrestore(&host->lock, flags); -@@ -1854,14 +1985,16 @@ +@@ -1854,14 +1986,16 @@ host = (struct sdhci_host*)param; @@ -30274,7 +30263,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ del_timer(&host->timer); -@@ -1905,6 +2038,7 @@ +@@ -1905,6 +2039,7 @@ spin_unlock_irqrestore(&host->lock, flags); mmc_request_done(host->mmc, mrq); @@ -30282,16 +30271,18 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } static void sdhci_timeout_timer(unsigned long data) -@@ -1917,7 +2051,7 @@ +@@ -1917,8 +2052,8 @@ spin_lock_irqsave(&host->lock, flags); if (host->mrq) { - printk(KERN_ERR "%s: Timeout waiting for hardware " +- "interrupt.\n", mmc_hostname(host->mmc)); + pr_err("%s: Timeout waiting for hardware " - "interrupt.\n", mmc_hostname(host->mmc)); ++ "interrupt - cmd%d.\n", mmc_hostname(host->mmc), host->last_cmdop); sdhci_dumpregs(host); -@@ -1963,10 +2097,13 @@ + if (host->data) { +@@ -1963,10 +2098,13 @@ BUG_ON(intmask == 0); if (!host->cmd) { @@ -30309,7 +30300,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return; } -@@ -2036,6 +2173,19 @@ +@@ -2036,6 +2174,19 @@ static void sdhci_show_adma_error(struct sdhci_host *host) { } #endif @@ -30329,7 +30320,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) { BUG_ON(intmask == 0); -@@ -2062,34 +2212,56 @@ +@@ -2062,34 +2213,56 @@ return; } } @@ -30402,7 +30393,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* * We currently don't do anything fancy with DMA -@@ -2118,30 +2290,27 @@ +@@ -2118,30 +2291,27 @@ sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); } @@ -30443,7 +30434,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ intmask = sdhci_readl(host, SDHCI_INT_STATUS); if (!intmask || intmask == 0xffffffff) { -@@ -2177,6 +2346,22 @@ +@@ -2177,6 +2347,22 @@ tasklet_schedule(&host->card_tasklet); } @@ -30466,7 +30457,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (intmask & SDHCI_INT_CMD_MASK) { sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, SDHCI_INT_STATUS); -@@ -2191,10 +2376,16 @@ +@@ -2191,10 +2377,16 @@ intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); @@ -30485,7 +30476,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc)); sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS); } -@@ -2207,7 +2398,7 @@ +@@ -2207,7 +2399,7 @@ intmask &= ~SDHCI_INT_CARD_INT; if (intmask) { @@ -30494,7 +30485,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc), intmask); sdhci_dumpregs(host); -@@ -2275,8 +2466,8 @@ +@@ -2275,8 +2467,8 @@ return ret; } @@ -30505,7 +30496,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (host->ops->enable_dma) host->ops->enable_dma(host); } -@@ -2314,6 +2505,90 @@ +@@ -2314,6 +2506,90 @@ #endif /* CONFIG_PM */ @@ -30596,7 +30587,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /*****************************************************************************\ * * * Device allocation/registration * -@@ -2356,6 +2631,8 @@ +@@ -2356,6 +2632,8 @@ if (debug_quirks) host->quirks = debug_quirks; @@ -30605,7 +30596,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ sdhci_reset(host, SDHCI_RESET_ALL); -@@ -2363,7 +2640,7 @@ +@@ -2363,7 +2641,7 @@ host->version = (host->version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; if (host->version > SDHCI_SPEC_300) { @@ -30614,7 +30605,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "You may experience problems.\n", mmc_hostname(mmc), host->version); } -@@ -2397,14 +2674,16 @@ +@@ -2397,14 +2675,16 @@ host->flags &= ~SDHCI_USE_ADMA; } @@ -30634,7 +30625,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } } } -@@ -2420,7 +2699,7 @@ +@@ -2420,7 +2700,7 @@ if (!host->adma_desc || !host->align_buffer) { kfree(host->adma_desc); kfree(host->align_buffer); @@ -30643,7 +30634,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "buffers. Falling back to standard DMA.\n", mmc_hostname(mmc)); host->flags &= ~SDHCI_USE_ADMA; -@@ -2448,8 +2727,7 @@ +@@ -2448,8 +2728,7 @@ if (host->max_clk == 0 || host->quirks & SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) { if (!host->ops->get_max_clock) { @@ -30653,7 +30644,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "frequency.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2495,8 +2773,7 @@ +@@ -2495,8 +2774,7 @@ host->timeout_clk = host->ops->get_timeout_clock(host); } else if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) { @@ -30663,7 +30654,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "frequency.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2517,7 +2794,7 @@ +@@ -2517,7 +2795,7 @@ /* Auto-CMD23 stuff only works in ADMA or PIO. */ if ((host->version >= SDHCI_SPEC_300) && ((host->flags & SDHCI_USE_ADMA) || @@ -30672,7 +30663,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ host->flags |= SDHCI_AUTO_CMD23; DBG("%s: Auto-CMD23 available\n", mmc_hostname(mmc)); } else { -@@ -2566,6 +2843,15 @@ +@@ -2566,6 +2844,15 @@ if (caps[1] & SDHCI_DRIVER_TYPE_D) mmc->caps |= MMC_CAP_DRIVER_TYPE_D; @@ -30688,7 +30679,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* Initial value for re-tuning timer count */ host->tuning_count = (caps[1] & SDHCI_RETUNING_TIMER_COUNT_MASK) >> SDHCI_RETUNING_TIMER_COUNT_SHIFT; -@@ -2641,6 +2927,12 @@ +@@ -2641,6 +2928,12 @@ mmc->caps |= MMC_CAP_MAX_CURRENT_200; } @@ -30701,7 +30692,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) -@@ -2655,7 +2947,7 @@ +@@ -2655,7 +2948,7 @@ mmc->ocr_avail_mmc &= host->ocr_avail_mmc; if (mmc->ocr_avail == 0) { @@ -30710,7 +30701,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "support voltages.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2703,7 +2995,7 @@ +@@ -2703,7 +2996,7 @@ mmc->max_blk_size = (caps[0] & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT; if (mmc->max_blk_size >= 3) { @@ -30719,7 +30710,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "assuming 512 bytes\n", mmc_hostname(mmc)); mmc->max_blk_size = 0; } -@@ -2742,7 +3034,7 @@ +@@ -2742,7 +3035,7 @@ host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); if (IS_ERR(host->vmmc)) { @@ -30728,7 +30719,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ host->vmmc = NULL; } else { regulator_enable(host->vmmc); -@@ -2771,8 +3063,9 @@ +@@ -2771,8 +3064,9 @@ mmc_add_host(mmc); @@ -30739,7 +30730,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -@@ -2804,7 +3097,7 @@ +@@ -2804,7 +3098,7 @@ host->flags |= SDHCI_DEVICE_DEAD; if (host->mrq) { @@ -30748,7 +30739,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ " transfer!\n", mmc_hostname(host->mmc)); host->mrq->cmd->error = -ENOMEDIUM; -@@ -2863,9 +3156,9 @@ +@@ -2863,9 +3157,9 @@ static int __init sdhci_drv_init(void) { @@ -30760,7 +30751,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return 0; } -@@ -2878,9 +3171,11 @@ +@@ -2878,9 +3172,11 @@ module_exit(sdhci_drv_exit); module_param(debug_quirks, uint, 0444); @@ -30774,7 +30765,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ +MODULE_PARM_DESC(debug_quirks2, "Force certain other quirks."); diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/host/sdhci.h --- linux-3.1.10/drivers/mmc/host/sdhci.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci.h 2012-05-16 13:42:31.646721970 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.h 2012-05-17 19:43:18.423591576 +0200 @@ -274,6 +274,25 @@ void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); @@ -30836,7 +30827,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/ #endif /* __SDHCI_HW_H */ diff -Naur linux-3.1.10/drivers/net/usb/smsc95xx.c linux-3.1.10.patch/drivers/net/usb/smsc95xx.c --- linux-3.1.10/drivers/net/usb/smsc95xx.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/net/usb/smsc95xx.c 2012-05-16 13:42:31.642721899 +0200 ++++ linux-3.1.10.patch/drivers/net/usb/smsc95xx.c 2012-05-17 19:43:18.419591496 +0200 @@ -46,6 +46,7 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -30935,7 +30926,7 @@ diff -Naur linux-3.1.10/drivers/net/usb/smsc95xx.c linux-3.1.10.patch/drivers/ne static const struct usb_device_id products[] = { diff -Naur linux-3.1.10/drivers/usb/core/generic.c linux-3.1.10.patch/drivers/usb/core/generic.c --- linux-3.1.10/drivers/usb/core/generic.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/generic.c 2012-05-16 13:42:31.045711409 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/generic.c 2012-05-17 19:43:17.963582317 +0200 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -30946,7 +30937,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/generic.c linux-3.1.10.patch/drivers/us } diff -Naur linux-3.1.10/drivers/usb/core/hub.c linux-3.1.10.patch/drivers/usb/core/hub.c --- linux-3.1.10/drivers/usb/core/hub.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/hub.c 2012-05-16 13:42:31.052711531 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/hub.c 2012-05-17 19:43:17.969582437 +0200 @@ -1071,6 +1071,8 @@ INIT_WORK(&hub->tt.clear_work, hub_tt_work); switch (hdev->descriptor.bDeviceProtocol) { @@ -31062,7 +31053,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/hub.c linux-3.1.10.patch/drivers/usb/co !hcd->driver->port_handed_over || diff -Naur linux-3.1.10/drivers/usb/core/message.c linux-3.1.10.patch/drivers/usb/core/message.c --- linux-3.1.10/drivers/usb/core/message.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/message.c 2012-05-16 13:42:31.053711549 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/message.c 2012-05-17 19:43:17.970582457 +0200 @@ -1836,6 +1836,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -31151,7 +31142,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/message.c linux-3.1.10.patch/drivers/us * to trigger binding of drivers to interfaces. probe() diff -Naur linux-3.1.10/drivers/usb/core/otg_whitelist.h linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h --- linux-3.1.10/drivers/usb/core/otg_whitelist.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h 2012-05-16 13:42:31.054711567 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h 2012-05-17 19:43:17.971582477 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -31369,7 +31360,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/otg_whitelist.h linux-3.1.10.patch/driv diff -Naur linux-3.1.10/drivers/usb/gadget/file_storage.c linux-3.1.10.patch/drivers/usb/gadget/file_storage.c --- linux-3.1.10/drivers/usb/gadget/file_storage.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/gadget/file_storage.c 2012-05-16 13:42:31.057711619 +0200 ++++ linux-3.1.10.patch/drivers/usb/gadget/file_storage.c 2012-05-17 19:43:17.975582559 +0200 @@ -572,8 +572,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -31493,7 +31484,7 @@ diff -Naur linux-3.1.10/drivers/usb/gadget/file_storage.c linux-3.1.10.patch/dri if (!req) diff -Naur linux-3.1.10/drivers/usb/gadget/Kconfig linux-3.1.10.patch/drivers/usb/gadget/Kconfig --- linux-3.1.10/drivers/usb/gadget/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/gadget/Kconfig 2012-05-16 13:42:31.638721829 +0200 ++++ linux-3.1.10.patch/drivers/usb/gadget/Kconfig 2012-05-17 19:43:18.415591415 +0200 @@ -525,6 +525,12 @@ depends on USB_GADGET depends on USB_GADGET_DUALSPEED @@ -31509,7 +31500,7 @@ diff -Naur linux-3.1.10/drivers/usb/gadget/Kconfig linux-3.1.10.patch/drivers/us # diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-05-16 13:42:31.060711672 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-05-17 19:43:17.991582880 +0200 @@ -0,0 +1,506 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.c $ @@ -32019,7 +32010,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1.10.p +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-05-16 13:42:31.061711690 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-05-17 19:43:17.993582920 +0200 @@ -0,0 +1,209 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.h $ @@ -32232,7 +32223,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1.10.p + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-05-16 13:42:31.063711725 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-05-17 19:43:17.994582940 +0200 @@ -0,0 +1,1247 @@ +#include "dwc_cc.h" +#include "dwc_modpow.h" @@ -33483,7 +33474,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +EXPORT_SYMBOL(DWC_WAITQ_ABORT); diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-05-16 13:42:31.064711742 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-05-17 19:43:17.995582961 +0200 @@ -0,0 +1,306 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.c $ @@ -33793,7 +33784,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.1. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-05-16 13:42:31.064711742 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-05-17 19:43:17.995582961 +0200 @@ -0,0 +1,103 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.h $ @@ -33900,7 +33891,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.1. +#endif /* _DWC_CRYPTO_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-05-16 13:42:31.065711759 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-05-17 19:43:17.996582982 +0200 @@ -0,0 +1,286 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.c $ @@ -34190,7 +34181,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1.10.p +#endif /* CONFIG_IPMATE_MACH */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-05-16 13:42:31.065711759 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-05-17 19:43:17.997583002 +0200 @@ -0,0 +1,98 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.h $ @@ -34292,7 +34283,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1.10.p +#endif /* _DWC_DH_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-05-16 13:42:31.067711795 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-05-17 19:43:17.998583022 +0200 @@ -0,0 +1,616 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -34912,7 +34903,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.1.10 +#endif /* !_SYS_QUEUE_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-05-16 13:42:31.067711795 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-05-17 19:43:17.998583022 +0200 @@ -0,0 +1,172 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -35088,7 +35079,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1.10. +#endif /* DEBUG_MEMORY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-05-16 13:42:31.068711813 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-05-17 19:43:17.999583042 +0200 @@ -0,0 +1,622 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -35714,7 +35705,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.1. +#endif /* CONFIG_MACH_IPMATE */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-05-16 13:42:31.069711831 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-05-17 19:43:18.000583062 +0200 @@ -0,0 +1,26 @@ +/* + * dwc_modpow.h @@ -35744,7 +35735,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.1. +#endif /* _LINUX_BIGNUM_H */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-05-16 13:42:31.069711831 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-05-17 19:43:18.000583062 +0200 @@ -0,0 +1,256 @@ +#include "dwc_notifier.h" +#include "dwc_list.h" @@ -36004,7 +35995,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-05-16 13:42:31.070711848 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-05-17 19:43:18.001583082 +0200 @@ -0,0 +1,112 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -36120,7 +36111,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3. +#endif /* __DWC_NOTIFIER_H__ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-05-16 13:42:31.588720950 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-05-17 19:43:18.364590389 +0200 @@ -0,0 +1,925 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_os.h $ @@ -37049,7 +37040,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1.10.p + */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile --- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile 2012-05-16 13:42:31.587720932 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile 2012-05-17 19:43:18.363590368 +0200 @@ -0,0 +1,46 @@ +# +# Makefile for DWC_common library @@ -37099,7 +37090,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile linux-3.1.10.p + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-05-16 13:42:31.059711654 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-05-17 19:43:17.990582860 +0200 @@ -0,0 +1,36 @@ +# +# Makefile for DWC_common library @@ -37139,7 +37130,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-3. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h 2012-05-16 13:42:31.073711900 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h 2012-05-17 19:43:18.095584977 +0200 @@ -0,0 +1,850 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37993,7 +37984,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h linux-3.1.10.patc +#endif /* _USB_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-05-16 13:42:31.134712972 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-05-17 19:43:18.125585579 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -39572,7 +39563,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.1.10.patc +module_exit (cleanup); diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-05-16 13:42:31.141713095 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-05-17 19:43:18.126585599 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -39718,7 +39709,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-05-16 13:42:31.144713148 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-05-17 19:43:18.128585639 +0200 @@ -0,0 +1,1316 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -41038,7 +41029,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.1.10.pat +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-05-16 13:42:31.144713148 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-05-17 19:43:18.129585659 +0200 @@ -0,0 +1,88 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -41130,7 +41121,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-05-16 13:42:31.147713201 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-05-17 19:43:18.131585699 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -43010,7 +43001,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.1.10.patc +#endif //DWC_UTE_CFI diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-05-16 13:42:31.148713218 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-05-17 19:43:18.132585719 +0200 @@ -0,0 +1,319 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -43333,7 +43324,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.1.10.patc +#endif /* (__DWC_OTG_CFI_H__) */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-05-16 13:42:31.155713341 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-05-17 19:43:18.140585879 +0200 @@ -0,0 +1,5410 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -48747,7 +48738,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.1.10.patc +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-05-16 13:42:31.157713376 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-05-17 19:43:18.142585921 +0200 @@ -0,0 +1,1143 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -49894,7 +49885,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.1.10.patc +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-05-16 13:42:31.159713412 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-05-17 19:43:18.144585961 +0200 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -50744,7 +50735,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.1.10 +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-05-16 13:42:31.160713430 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-05-17 19:43:18.145585981 +0200 @@ -0,0 +1,641 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -51389,7 +51380,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1.10. +#endif /* __DWC_CORE_IF_H__ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-05-16 13:42:31.161713447 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-05-17 19:43:18.145585981 +0200 @@ -0,0 +1,113 @@ +/* ========================================================================== + * @@ -51506,7 +51497,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.1.10.patc +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-05-16 13:42:31.164713499 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-05-17 19:43:18.148586041 +0200 @@ -0,0 +1,1577 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -53087,7 +53078,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1.10.p +*/ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-05-16 13:42:31.164713499 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-05-17 19:43:18.149586061 +0200 @@ -0,0 +1,101 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -53192,7 +53183,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-05-16 13:42:31.631721706 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-05-17 19:43:18.407591255 +0200 @@ -0,0 +1,3334 @@ + +/* ========================================================================== @@ -56530,7 +56521,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.1.10.patc +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-05-16 13:42:31.173713658 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-05-17 19:43:18.156586202 +0200 @@ -0,0 +1,1106 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -57640,7 +57631,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.1.10 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-05-16 13:42:31.643721916 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-05-17 19:43:18.420591516 +0200 @@ -0,0 +1,804 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -58448,7 +58439,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patc +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-05-16 13:42:31.174713676 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-05-17 19:43:18.157586223 +0200 @@ -0,0 +1,393 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -58845,7 +58836,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1.10.p +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-05-16 13:42:31.178713745 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-05-17 19:43:18.160586283 +0200 @@ -0,0 +1,2065 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -60914,7 +60905,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.1.10 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-05-16 13:42:31.648722005 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-05-17 19:43:18.424591596 +0200 @@ -0,0 +1,848 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $ @@ -61766,7 +61757,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.1.1 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-05-16 13:42:31.180713781 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-05-17 19:43:18.163586343 +0200 @@ -0,0 +1,732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -62502,7 +62493,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.1.1 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-05-16 13:42:31.183713833 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-05-17 19:43:18.166586403 +0200 @@ -0,0 +1,2067 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -64573,7 +64564,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.1.10.patc +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-05-16 13:42:31.184713850 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-05-17 19:43:18.167586423 +0200 @@ -0,0 +1,216 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -64793,7 +64784,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.1.10.patc +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-05-16 13:42:31.184713850 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-05-17 19:43:18.168586443 +0200 @@ -0,0 +1,333 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -65130,7 +65121,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1.10.p +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-05-16 13:42:31.190713956 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-05-17 19:43:18.173586544 +0200 @@ -0,0 +1,4077 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -69211,7 +69202,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.1.10 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-05-16 13:42:31.192713991 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-05-17 19:43:18.175586584 +0200 @@ -0,0 +1,1288 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -70503,7 +70494,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.1.1 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-05-16 13:42:31.195714045 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-05-17 19:43:18.178586644 +0200 @@ -0,0 +1,2237 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -72744,7 +72735,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile --- linux-3.1.10/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile 2012-05-16 13:42:31.589720968 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile 2012-05-17 19:43:18.364590389 +0200 @@ -0,0 +1,80 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -72828,7 +72819,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/Makefile linux-3.1.10.patch/dri +endif diff -Naur linux-3.1.10/drivers/usb/host/Kconfig linux-3.1.10.patch/drivers/usb/host/Kconfig --- linux-3.1.10/drivers/usb/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/Kconfig 2012-05-16 13:42:31.058711636 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/Kconfig 2012-05-17 19:43:17.976582579 +0200 @@ -543,6 +543,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -72851,7 +72842,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/Kconfig linux-3.1.10.patch/drivers/usb/ depends on USB && ARM && MACH_MX21 diff -Naur linux-3.1.10/drivers/usb/host/Makefile linux-3.1.10.patch/drivers/usb/host/Makefile --- linux-3.1.10/drivers/usb/host/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/Makefile 2012-05-16 13:42:31.059711654 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/Makefile 2012-05-17 19:43:17.976582579 +0200 @@ -32,6 +32,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -72863,7 +72854,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/Makefile linux-3.1.10.patch/drivers/usb obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o diff -Naur linux-3.1.10/drivers/usb/Makefile linux-3.1.10.patch/drivers/usb/Makefile --- linux-3.1.10/drivers/usb/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/Makefile 2012-05-16 13:42:31.044711391 +0200 ++++ linux-3.1.10.patch/drivers/usb/Makefile 2012-05-17 19:43:17.962582296 +0200 @@ -21,6 +21,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -72874,8 +72865,8 @@ diff -Naur linux-3.1.10/drivers/usb/Makefile linux-3.1.10.patch/drivers/usb/Make diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/video/bcm2708_fb.c --- linux-3.1.10/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/bcm2708_fb.c 2012-05-16 13:42:31.647721988 +0200 -@@ -0,0 +1,475 @@ ++++ linux-3.1.10.patch/drivers/video/bcm2708_fb.c 2012-05-17 19:43:18.426591638 +0200 +@@ -0,0 +1,473 @@ +/* + * linux/drivers/video/bcm2708_fb.c + * @@ -72896,7 +72887,6 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi +#include +#include +#include -+#include +#include +#include +#include @@ -73099,8 +73089,7 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + /* inform vc about new framebuffer */ + bcm_mailbox_write(MBOX_CHAN_FB, fb->dma); + -+ /* workaround occasional failure to read results. TODO: replace fb driver with vchiq version */ -+ msleep(10); ++ /* TODO: replace fb driver with vchiq version */ + /* wait for response */ + bcm_mailbox_read(MBOX_CHAN_FB, &val); + @@ -73353,7 +73342,7 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); diff -Naur linux-3.1.10/drivers/video/Kconfig linux-3.1.10.patch/drivers/video/Kconfig --- linux-3.1.10/drivers/video/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/Kconfig 2012-05-16 13:42:31.490719229 +0200 ++++ linux-3.1.10.patch/drivers/video/Kconfig 2012-05-17 19:43:18.273588558 +0200 @@ -303,6 +303,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -73377,7 +73366,7 @@ diff -Naur linux-3.1.10/drivers/video/Kconfig linux-3.1.10.patch/drivers/video/K depends on FB && ARM && ARM_AMBA diff -Naur linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-05-16 13:42:31.497719352 +0200 ++++ linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-05-17 19:43:18.279588678 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -75866,7 +75855,7 @@ diff -Naur linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.10.p +0 0 0 0 0 0 0 0 0 diff -Naur linux-3.1.10/drivers/video/Makefile linux-3.1.10.patch/drivers/video/Makefile --- linux-3.1.10/drivers/video/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/Makefile 2012-05-16 13:42:31.491719246 +0200 ++++ linux-3.1.10.patch/drivers/video/Makefile 2012-05-17 19:43:18.273588558 +0200 @@ -95,6 +95,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -75877,7 +75866,7 @@ diff -Naur linux-3.1.10/drivers/video/Makefile linux-3.1.10.patch/drivers/video/ obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o diff -Naur linux-3.1.10/drivers/watchdog/bcm2708_wdog.c linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c --- linux-3.1.10/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c 2012-05-16 13:42:31.489719211 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c 2012-05-17 19:43:18.271588518 +0200 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -76266,7 +76255,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/bcm2708_wdog.c linux-3.1.10.patch/drive + diff -Naur linux-3.1.10/drivers/watchdog/Kconfig linux-3.1.10.patch/drivers/watchdog/Kconfig --- linux-3.1.10/drivers/watchdog/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/Kconfig 2012-05-16 13:42:31.487719175 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/Kconfig 2012-05-17 19:43:18.269588477 +0200 @@ -348,6 +348,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -76282,7 +76271,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/Kconfig linux-3.1.10.patch/drivers/watc config AT32AP700X_WDT diff -Naur linux-3.1.10/drivers/watchdog/Makefile linux-3.1.10.patch/drivers/watchdog/Makefile --- linux-3.1.10/drivers/watchdog/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/Makefile 2012-05-16 13:42:31.488719193 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/Makefile 2012-05-17 19:43:18.270588498 +0200 @@ -54,6 +54,7 @@ obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -76293,7 +76282,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/Makefile linux-3.1.10.patch/drivers/wat obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff -Naur linux-3.1.10/include/linux/mmc/host.h linux-3.1.10.patch/include/linux/mmc/host.h --- linux-3.1.10/include/linux/mmc/host.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/include/linux/mmc/host.h 2012-05-16 13:42:31.486719157 +0200 ++++ linux-3.1.10.patch/include/linux/mmc/host.h 2012-05-17 19:43:18.268588456 +0200 @@ -12,6 +12,7 @@ #include @@ -76374,7 +76363,7 @@ diff -Naur linux-3.1.10/include/linux/mmc/host.h linux-3.1.10.patch/include/linu #endif /* LINUX_MMC_HOST_H */ diff -Naur linux-3.1.10/include/linux/mmc/sdhci.h linux-3.1.10.patch/include/linux/mmc/sdhci.h --- linux-3.1.10/include/linux/mmc/sdhci.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/include/linux/mmc/sdhci.h 2012-05-16 13:42:31.486719157 +0200 ++++ linux-3.1.10.patch/include/linux/mmc/sdhci.h 2012-05-17 19:43:18.268588456 +0200 @@ -88,6 +88,10 @@ /* The read-only detection via SDHCI_PRESENT_STATE register is unstable */ #define SDHCI_QUIRK_UNSTABLE_RO_DETECT (1<<31) @@ -76410,7 +76399,7 @@ diff -Naur linux-3.1.10/include/linux/mmc/sdhci.h linux-3.1.10.patch/include/lin diff -Naur linux-3.1.10/sound/arm/bcm2835.c linux-3.1.10.patch/sound/arm/bcm2835.c --- linux-3.1.10/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835.c 2012-05-16 13:42:31.622721547 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835.c 2012-05-17 19:43:18.399591093 +0200 @@ -0,0 +1,423 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -76837,7 +76826,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835.c linux-3.1.10.patch/sound/arm/bcm2835 +MODULE_ALIAS("platform:bcm2835_alsa"); diff -Naur linux-3.1.10/sound/arm/bcm2835-ctl.c linux-3.1.10.patch/sound/arm/bcm2835-ctl.c --- linux-3.1.10/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-ctl.c 2012-05-16 13:42:31.618721478 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-ctl.c 2012-05-17 19:43:18.395591013 +0200 @@ -0,0 +1,172 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -77013,7 +77002,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-ctl.c linux-3.1.10.patch/sound/arm/bcm +} diff -Naur linux-3.1.10/sound/arm/bcm2835.h linux-3.1.10.patch/sound/arm/bcm2835.h --- linux-3.1.10/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835.h 2012-05-16 13:42:31.626721619 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835.h 2012-05-17 19:43:18.402591154 +0200 @@ -0,0 +1,242 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -77259,7 +77248,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835.h linux-3.1.10.patch/sound/arm/bcm2835 +#endif /* __SOUND_ARM_BCM2835_H */ diff -Naur linux-3.1.10/sound/arm/bcm2835-pcm.c linux-3.1.10.patch/sound/arm/bcm2835-pcm.c --- linux-3.1.10/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-pcm.c 2012-05-16 13:42:31.625721601 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-pcm.c 2012-05-17 19:43:18.401591133 +0200 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -77687,7 +77676,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-pcm.c linux-3.1.10.patch/sound/arm/bcm +} diff -Naur linux-3.1.10/sound/arm/bcm2835-vchiq.c linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c --- linux-3.1.10/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c 2012-05-16 13:42:31.629721670 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c 2012-05-17 19:43:18.405591215 +0200 @@ -0,0 +1,818 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -78509,7 +78498,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-vchiq.c linux-3.1.10.patch/sound/arm/b +} diff -Naur linux-3.1.10/sound/arm/Kconfig linux-3.1.10.patch/sound/arm/Kconfig --- linux-3.1.10/sound/arm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/Kconfig 2012-05-16 13:42:31.610721337 +0200 ++++ linux-3.1.10.patch/sound/arm/Kconfig 2012-05-17 19:43:18.386590832 +0200 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -78525,7 +78514,7 @@ diff -Naur linux-3.1.10/sound/arm/Kconfig linux-3.1.10.patch/sound/arm/Kconfig diff -Naur linux-3.1.10/sound/arm/Makefile linux-3.1.10.patch/sound/arm/Makefile --- linux-3.1.10/sound/arm/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/Makefile 2012-05-16 13:42:31.610721337 +0200 ++++ linux-3.1.10.patch/sound/arm/Makefile 2012-05-17 19:43:18.426591638 +0200 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -78534,11 +78523,11 @@ diff -Naur linux-3.1.10/sound/arm/Makefile linux-3.1.10.patch/sound/arm/Makefile +obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o +snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o + -+EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel ++EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 + diff -Naur linux-3.1.10/sound/arm/vc_vchi_audioserv_defs.h linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.1.10/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-05-16 13:42:31.624721583 +0200 ++++ linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-05-17 19:43:18.400591113 +0200 @@ -0,0 +1,112 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved.