diff --git a/packages/network/openssh/meta b/packages/network/openssh/meta index ac974db1b5..d66c828221 100644 --- a/packages/network/openssh/meta +++ b/packages/network/openssh/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openssh" -PKG_VERSION="6.1p1" +PKG_VERSION="6.2p1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.rpi b/packages/sysutils/remote/lirc/config/lircd.conf.rpi index 494d26c287..c83d48f932 100644 --- a/packages/sysutils/remote/lirc/config/lircd.conf.rpi +++ b/packages/sysutils/remote/lirc/config/lircd.conf.rpi @@ -4,6 +4,8 @@ # Enables use of MCE Remote, Apple MacMini and XBOX remote. # Should work with any generic receiver # +# contributed by jenkins101 +# ######## # # brand: HP/Philips/Microsoft/Other @@ -281,3 +283,160 @@ begin remote end remote +# Please make this file available to others +# by sending it to +# +# this config file was automatically generated +# using lirc-0.9.0-pre1(default) on Sat Feb 23 12:47:57 2013 +# +# contributed by DynaMight +# +# brand: Xbox 360 remote +# model no. of remote control: +# devices being controlled by this remote: +# + +begin remote + + name Xbox 360 Remote + bits 13 + flags RC6|CONST_LENGTH + eps 30 + aeps 100 + + header 2685 886 + one 457 433 + zero 457 433 + pre_data_bits 24 + pre_data 0x1BFF80 + gap 107197 + min_repeat 4 + suppress_repeat 4 +# uncomment to suppress unwanted repeats + toggle_bit_mask 0x8000 + rc6_mask 0x100000000 + + begin codes + KEY_STOP 0x0BE6 + KEY_PLAY 0x0BE9 + KEY_VOLUMEDOWN 0x0BEE + KEY_VOLUMEUP 0x0BEF + KEY_MUTE 0x0BF1 + KEY_0 0x0BFF + KEY_1 0x0BFE + KEY_2 0x0BFD + KEY_3 0x0BFC + KEY_4 0x0BFB + KEY_5 0x0BFA + KEY_6 0x0BF9 + KEY_7 0x0BF8 + KEY_8 0x0BF7 + KEY_9 0x0BF6 + KEY_MENU 0x0BDB + KEY_YELLOW 0x0BD9 + KEY_BLUE 0x0B97 + KEY_GREEN 0x0B99 + KEY_RED 0x0BDA + KEY_REWIND 0x0BEA + KEY_PLAYPAUSE 0x0BE9 + KEY_FASTFORWARD 0x0BEB + KEY_BACK 0x0BDC + KEY_TITLE 0x0BAE + KEY_STOP 0x0BE6 + KEY_INFO 0x0BF0 + KEY_UP 0x0BE1 + KEY_DOWN 0x0BE0 + KEY_LEFT 0x0BDF + KEY_RIGHT 0x0BDE + KEY_OK 0x0BDD + KEY_POWER 0x0BF3 + KEY_PAGEUP 0x0B93 + KEY_PAGEDOWN 0x0B92 + KEY_ENTER 0x0BF4 + KEY_RECORD 0x0BE8 + KEY_CLEAR 0x0BF5 + KEY_NEXTSONG 0x0BE5 + KEY_PREVIOUSSONG 0x0BE4 + KEY_DISPLAYTOGGLE 0x0BB0 + KEY_PAUSE 0x037FF00BE7 + end codes + +end remote + +# this config file was manually generated +# using WinLIRC 0.6.5 (LIRC 0.6.1pre3) on Wed Feb 28 11:27:58 2007 +# +# contributed by Luca Cristoforetti +# +# brand: Dream Multimedia Dreambox 7025 +# model: URC-39930RJ0-03 +# devices being controlled by this remote: +# This is a remote with an option of a universal +# TV. Use TV CODE: 0680 +# +# (press TV, hold down shift until you got +# 2 blinks, enter the code and you get 2 +# flashes for confirmation) +# + +begin remote + + name Dream_Multimedia_URC-39930 + bits 24 + flags SPACE_ENC + eps 25 + aeps 100 + + header 3488 1710 + one 426 415 + zero 426 1287 + ptrail 426 + pre_data_bits 24 + pre_data 0xBFFBFE + gap 73939 + min_repeat 4 + suppress_repeat 4 +# uncomment to suppress unwanted repeats + toggle_bit 0 + + + begin codes + KEY_POWER 0x0000000000FF4342 + KEY_1 0x0000000000FFF7F6 + KEY_2 0x0000000000FF7776 + KEY_3 0x0000000000FFB7B6 + KEY_4 0x0000000000FF3736 + KEY_5 0x0000000000FFD7D6 + KEY_6 0x0000000000FF5756 + KEY_7 0x0000000000FF9796 + KEY_8 0x0000000000FF1716 + KEY_9 0x0000000000FFE7E6 + KEY_0 0x0000000000FF6766 + < 0x0000000000FF5F5E + > 0x0000000000FF2322 + KEY_VOLUMEUP 0x0000000000FFFBFA + KEY_VOLUMEDOWN 0x0000000000FF7B7A + KEY_MUTE 0x0000000000FFB3B2 + KEY_EXIT 0x0000000000DF84A5 + KEY_CHANNELUP 0x0000000000FFD3D2 + KEY_CHANNELDOWN 0x0000000000FF5352 + KEY_INFO 0x0000000000FF6362 + KEY_UP 0x0000000000FFADAC + KEY_LEFT 0x0000000000FF8D8C + KEY_RIGHT 0x0000000000FF0D0C + KEY_DOWN 0x0000000000FF2D2C + KEY_OK 0x0000000000FF6D6C + KEY_MENU 0x0000000000FF1E1F + KEY_AUDIO 0x0000000000FF3435 + KEY_VIDEO 0x0000000000FF1312 + KEY_BACKSPACE 0x0000000000FFF1F0 + KEY_PLAY 0x0000000000FF7170 + KEY_PAUSE 0x0000000000FFB1B0 + KEY_FORWARD 0x0000000000FF3130 + KEY_STOP 0x00000000007F6FEE + KEY_RADIO 0x0000000000FFB5B4 + KEY_TEXT 0x00000000007F3FBE + KEY_TITLE 0x00000000007FBF3E + end codes + +end remote diff --git a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch similarity index 98% rename from projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch rename to projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch index 19c531780e..bb317c6693 100644 --- a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch +++ b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch @@ -1,19 +1,6 @@ -diff -Naur linux-3.6.11/arch/arm/boot/compressed/decompress.c linux-rpi-3.6.y/arch/arm/boot/compressed/decompress.c ---- linux-3.6.11/arch/arm/boot/compressed/decompress.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/boot/compressed/decompress.c 2013-03-19 15:30:32.401096952 +0100 -@@ -32,6 +32,9 @@ - # define Tracecv(c,x) - #endif - -+/* Not needed, but used in some headers pulled in by decompressors */ -+extern char * strstr(const char * s1, const char *s2); -+ - #ifdef CONFIG_KERNEL_GZIP - #include "../../../../lib/decompress_inflate.c" - #endif diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-03-19 15:30:33.497089006 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-02-28 04:23:24.903596383 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -563,7 +550,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-03-19 15:30:33.400089710 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-02-28 04:23:24.901596390 +0100 @@ -0,0 +1,1001 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -1568,7 +1555,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-03-19 15:30:33.405089673 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-02-28 04:23:24.899596397 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2104,7 +2091,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-03-19 15:30:33.496089014 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-02-28 04:23:24.894596418 +0100 @@ -0,0 +1,298 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -2406,7 +2393,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/ +CONFIG_AVERAGE=y diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/include/asm/fiq.h --- linux-3.6.11/arch/arm/include/asm/fiq.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-03-19 15:30:32.680094929 +0100 ++++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-02-28 04:23:24.927596289 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2417,7 +2404,7 @@ diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/incl { diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig --- linux-3.6.11/arch/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-03-19 15:30:33.090091957 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-02-28 04:23:24.936596253 +0100 @@ -999,6 +999,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2452,7 +2439,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig config ARCH_ACORN diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.debug --- linux-3.6.11/arch/arm/Kconfig.debug 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-03-19 15:30:31.429103997 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-02-28 04:23:25.032595878 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2470,7 +2457,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig. config EARLY_PRINTK diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S --- linux-3.6.11/arch/arm/kernel/fiqasm.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-03-19 15:30:31.170105875 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-02-28 04:23:24.670597292 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2481,7 +2468,7 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel +ENDPROC(__FIQ_Branch) diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq.c --- linux-3.6.11/arch/arm/kernel/fiq.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-03-19 15:30:31.170105875 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-02-28 04:23:24.677597265 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2490,162 +2477,9 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fi EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Naur linux-3.6.11/arch/arm/lib/memset.S linux-rpi-3.6.y/arch/arm/lib/memset.S ---- linux-3.6.11/arch/arm/lib/memset.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/lib/memset.S 2013-03-19 15:30:33.266090681 +0100 -@@ -19,9 +19,9 @@ - 1: subs r2, r2, #4 @ 1 do we have enough - blt 5f @ 1 bytes to align with? - cmp r3, #2 @ 1 -- strltb r1, [r0], #1 @ 1 -- strleb r1, [r0], #1 @ 1 -- strb r1, [r0], #1 @ 1 -+ strltb r1, [ip], #1 @ 1 -+ strleb r1, [ip], #1 @ 1 -+ strb r1, [ip], #1 @ 1 - add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) - /* - * The pointer is now aligned and the length is adjusted. Try doing the -@@ -29,10 +29,14 @@ - */ - - ENTRY(memset) -- ands r3, r0, #3 @ 1 unaligned? -+/* -+ * Preserve the contents of r0 for the return value. -+ */ -+ mov ip, r0 -+ ands r3, ip, #3 @ 1 unaligned? - bne 1b @ 1 - /* -- * we know that the pointer in r0 is aligned to a word boundary. -+ * we know that the pointer in ip is aligned to a word boundary. - */ - orr r1, r1, r1, lsl #8 - orr r1, r1, r1, lsl #16 -@@ -43,29 +47,28 @@ - #if ! CALGN(1)+0 - - /* -- * We need an extra register for this loop - save the return address and -- * use the LR -+ * We need 2 extra registers for this loop - use r8 and the LR - */ -- str lr, [sp, #-4]! -- mov ip, r1 -+ stmfd sp!, {r8, lr} -+ mov r8, r1 - mov lr, r1 - - 2: subs r2, r2, #64 -- stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time. -- stmgeia r0!, {r1, r3, ip, lr} -- stmgeia r0!, {r1, r3, ip, lr} -- stmgeia r0!, {r1, r3, ip, lr} -+ stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time. -+ stmgeia ip!, {r1, r3, r8, lr} -+ stmgeia ip!, {r1, r3, r8, lr} -+ stmgeia ip!, {r1, r3, r8, lr} - bgt 2b -- ldmeqfd sp!, {pc} @ Now <64 bytes to go. -+ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. - /* - * No need to correct the count; we're only testing bits from now on - */ - tst r2, #32 -- stmneia r0!, {r1, r3, ip, lr} -- stmneia r0!, {r1, r3, ip, lr} -+ stmneia ip!, {r1, r3, r8, lr} -+ stmneia ip!, {r1, r3, r8, lr} - tst r2, #16 -- stmneia r0!, {r1, r3, ip, lr} -- ldr lr, [sp], #4 -+ stmneia ip!, {r1, r3, r8, lr} -+ ldmfd sp!, {r8, lr} - - #else - -@@ -74,54 +77,54 @@ - * whole cache lines at once. - */ - -- stmfd sp!, {r4-r7, lr} -+ stmfd sp!, {r4-r8, lr} - mov r4, r1 - mov r5, r1 - mov r6, r1 - mov r7, r1 -- mov ip, r1 -+ mov r8, r1 - mov lr, r1 - - cmp r2, #96 -- tstgt r0, #31 -+ tstgt ip, #31 - ble 3f - -- and ip, r0, #31 -- rsb ip, ip, #32 -- sub r2, r2, ip -- movs ip, ip, lsl #(32 - 4) -- stmcsia r0!, {r4, r5, r6, r7} -- stmmiia r0!, {r4, r5} -- tst ip, #(1 << 30) -- mov ip, r1 -- strne r1, [r0], #4 -+ and r8, ip, #31 -+ rsb r8, r8, #32 -+ sub r2, r2, r8 -+ movs r8, r8, lsl #(32 - 4) -+ stmcsia ip!, {r4, r5, r6, r7} -+ stmmiia ip!, {r4, r5} -+ tst r8, #(1 << 30) -+ mov r8, r1 -+ strne r1, [ip], #4 - - 3: subs r2, r2, #64 -- stmgeia r0!, {r1, r3-r7, ip, lr} -- stmgeia r0!, {r1, r3-r7, ip, lr} -+ stmgeia ip!, {r1, r3-r8, lr} -+ stmgeia ip!, {r1, r3-r8, lr} - bgt 3b -- ldmeqfd sp!, {r4-r7, pc} -+ ldmeqfd sp!, {r4-r8, pc} - - tst r2, #32 -- stmneia r0!, {r1, r3-r7, ip, lr} -+ stmneia ip!, {r1, r3-r8, lr} - tst r2, #16 -- stmneia r0!, {r4-r7} -- ldmfd sp!, {r4-r7, lr} -+ stmneia ip!, {r4-r7} -+ ldmfd sp!, {r4-r8, lr} - - #endif - - 4: tst r2, #8 -- stmneia r0!, {r1, r3} -+ stmneia ip!, {r1, r3} - tst r2, #4 -- strne r1, [r0], #4 -+ strne r1, [ip], #4 - /* - * When we get here, we've got less than 4 bytes to zero. We - * may have an unaligned pointer as well. - */ - 5: tst r2, #2 -- strneb r1, [r0], #1 -- strneb r1, [r0], #1 -+ strneb r1, [ip], #1 -+ strneb r1, [ip], #1 - tst r2, #1 -- strneb r1, [r0], #1 -+ strneb r1, [ip], #1 - mov pc, lr - ENDPROC(memset) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-03-19 15:30:31.974100047 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2876,7 +2710,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm +} diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-03-19 15:30:31.968100091 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2907,7 +2741,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-03-19 15:30:31.968100091 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,947 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3858,8 +3692,8 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm +module_param(uart_clock, uint, 0644); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-03-19 15:30:31.988099946 +0100 -@@ -0,0 +1,341 @@ ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-02-28 04:23:24.455598131 +0100 +@@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c + * @@ -4035,8 +3869,6 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc + unsigned long rising = readl(gpio->base + GPIOREN(gb)); + unsigned long falling = readl(gpio->base + GPIOFEN(gb)); + -+ gn = gn % 32; -+ + writel(rising & ~(1 << gn), gpio->base + GPIOREN(gb)); + writel(falling & ~(1 << gn), gpio->base + GPIOFEN(gb)); +} @@ -4203,7 +4035,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4258,7 +4090,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c --- linux-3.6.11/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4323,7 +4155,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/m +EXPORT_SYMBOL(clk_set_rate); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h --- linux-3.6.11/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-03-19 15:30:31.968100091 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4351,7 +4183,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/m +}; diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S --- linux-3.6.11/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4376,7 +4208,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/m +ENDPROC(bcm2708_delay) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c --- linux-3.6.11/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-03-19 15:30:31.968100091 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-02-28 04:23:24.456598127 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4777,7 +4609,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mac +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c --- linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,887 @@ +#include +#include @@ -5668,7 +5500,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -6091,7 +5923,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-r +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -6155,7 +5987,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -6166,7 +5998,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -6192,7 +6024,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-r +#include diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6280,7 +6112,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y +#endif /* _MACH_BCM2708_DMA_H */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6353,7 +6185,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-r + .endm diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6395,7 +6227,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6447,7 +6279,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6479,7 +6311,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi- +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-03-19 15:30:31.974100047 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6511,7 +6343,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6714,7 +6546,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6. +#endif /* _BCM2708_IRQS_H_ */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6775,7 +6607,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,226 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -7005,7 +6837,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi- +/* END */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -7035,7 +6867,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6 +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -7077,7 +6909,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -7104,7 +6936,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6 +#define CLOCK_TICK_RATE (1000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-02-28 04:23:24.458598120 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -7193,7 +7025,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rp + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7338,7 +7170,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7378,7 +7210,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-03-19 15:30:31.975100040 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-02-28 04:23:24.459598116 +0100 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -7451,7 +7283,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rp +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-02-28 04:23:24.457598123 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7475,7 +7307,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3 +#define VMALLOC_END (0xe8000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig --- linux-3.6.11/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -7520,7 +7352,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/m +endmenu diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-03-19 15:30:31.968100091 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel. @@ -7535,14 +7367,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-03-19 15:30:31.977100025 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c --- linux-3.6.11/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-02-28 04:23:24.453598139 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7740,7 +7572,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/m +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c --- linux-3.6.11/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-02-28 04:23:24.455598131 +0100 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -8218,7 +8050,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/ma +MODULE_ALIAS("platform:bcm-mbox"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-03-19 15:30:31.988099946 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-02-28 04:23:24.454598135 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8680,7 +8512,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-03-19 15:30:31.974100047 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-02-28 04:23:24.460598112 +0100 @@ -0,0 +1,319 @@ +/* + * vc_support.c @@ -9003,7 +8835,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/ + diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile --- linux-3.6.11/arch/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Makefile 2013-03-19 15:30:31.288105021 +0100 ++++ linux-rpi-3.6.y/arch/arm/Makefile 2013-02-28 04:23:24.614597511 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -9014,7 +8846,7 @@ diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile # by CONFIG_* macro name. diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alignment.c --- linux-3.6.11/arch/arm/mm/alignment.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-03-19 15:30:33.706087491 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-02-28 04:23:24.577597656 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -9031,7 +8863,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alig goto bad; diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig --- linux-3.6.11/arch/arm/mm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-03-19 15:30:33.707087484 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-02-28 04:23:24.585597624 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -9043,7 +8875,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig select CPU_PABRT_V6 diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6.S --- linux-3.6.11/arch/arm/mm/proc-v6.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-03-19 15:30:33.692087593 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-02-28 04:23:24.584597628 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -9069,7 +8901,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v ENTRY(cpu_v6_dcache_clean_area) diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/mach-types --- linux-3.6.11/arch/arm/tools/mach-types 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-03-19 15:30:33.324090260 +0100 ++++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-02-28 04:23:24.768596910 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -9080,7 +8912,7 @@ diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 diff -Naur linux-3.6.11/arch/arm/vfp/vfpmodule.c linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c --- linux-3.6.11/arch/arm/vfp/vfpmodule.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c 2013-03-19 15:30:32.807094009 +0100 ++++ linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c 2013-02-28 04:23:24.732597050 +0100 @@ -413,7 +413,7 @@ * If there isn't a second FP instruction, exit now. Note that * the FPEXC.FP2V bit is valid only if FPEXC.EX is 1. @@ -9092,7 +8924,7 @@ diff -Naur linux-3.6.11/arch/arm/vfp/vfpmodule.c linux-rpi-3.6.y/arch/arm/vfp/vf /* diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/char/broadcom/Kconfig --- linux-3.6.11/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-03-19 15:30:49.616972120 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-02-28 04:23:36.673550432 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -9114,13 +8946,13 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/ch + diff -Naur linux-3.6.11/drivers/char/broadcom/Makefile linux-rpi-3.6.y/drivers/char/broadcom/Makefile --- linux-3.6.11/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-03-19 15:30:49.615972127 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile --- linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-03-19 15:30:49.615972127 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -9139,7 +8971,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/dr + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c --- linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-03-19 15:30:49.616972120 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-02-28 04:23:36.672550436 +0100 @@ -0,0 +1,1145 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10288,7 +10120,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dr +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c --- linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-03-19 15:30:49.599972243 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-02-28 04:23:36.677550418 +0100 @@ -0,0 +1,117 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10409,7 +10241,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/dri +MODULE_LICENSE("GPL and additional rights"); diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/char/hw_random/Kconfig --- linux-3.6.11/drivers/char/hw_random/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-03-19 15:30:49.599972243 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-02-28 04:23:36.676550421 +0100 @@ -289,3 +289,14 @@ module will be called exynos-rng. @@ -10428,7 +10260,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/c \ Kein Zeilenumbruch am Dateiende. diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/char/hw_random/Makefile --- linux-3.6.11/drivers/char/hw_random/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-03-19 15:30:49.598972251 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-02-28 04:23:36.674550428 +0100 @@ -25,3 +25,4 @@ obj-$(CONFIG_HW_RANDOM_PPC4XX) += ppc4xx-rng.o obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o @@ -10436,7 +10268,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/ +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig --- linux-3.6.11/drivers/char/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-03-19 15:30:49.608972178 +0100 ++++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-02-28 04:23:36.686550383 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -10448,7 +10280,7 @@ diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfi default n diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefile --- linux-3.6.11/drivers/char/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Makefile 2013-03-19 15:30:49.587972330 +0100 ++++ linux-rpi-3.6.y/drivers/char/Makefile 2013-02-28 04:23:36.666550460 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -10458,7 +10290,7 @@ diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makef + diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c --- linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-03-19 15:30:49.533972722 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-02-28 04:23:35.792553872 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10701,7 +10533,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/driver + diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm --- linux-3.6.11/drivers/cpufreq/Kconfig.arm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-03-19 15:30:49.534972715 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-02-28 04:23:35.803553830 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -10717,7 +10549,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpuf + diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/Makefile --- linux-3.6.11/drivers/cpufreq/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-03-19 15:30:49.530972743 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-02-28 04:23:35.791553876 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -10728,7 +10560,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq # PowerPC platform drivers diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c --- linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-03-19 15:30:50.011969255 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-02-28 04:23:35.871553564 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10951,7 +10783,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hw +module_platform_driver(bcm2835_hwmon_driver); diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconfig --- linux-3.6.11/drivers/hwmon/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-03-19 15:30:50.417966311 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-02-28 04:23:35.893553478 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -10971,7 +10803,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kcon comment "ACPI drivers" diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Makefile --- linux-3.6.11/drivers/hwmon/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-03-19 15:30:50.018969204 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-02-28 04:23:35.846553661 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -10982,7 +10814,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Mak diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c --- linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-03-19 15:30:51.470958673 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-02-28 04:23:36.074552771 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -11386,7 +11218,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/busses/Kconfig --- linux-3.6.11/drivers/i2c/busses/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-03-19 15:30:51.475958637 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-02-28 04:23:36.086552725 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -11415,7 +11247,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/b depends on BLACKFIN diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/busses/Makefile --- linux-3.6.11/drivers/i2c/busses/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-03-19 15:30:51.458958760 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-02-28 04:23:36.071552784 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -11426,7 +11258,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/ obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig --- linux-3.6.11/drivers/misc/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-03-19 15:30:55.549929087 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-02-28 04:23:39.683538681 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -11436,7 +11268,7 @@ diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfi + diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makefile --- linux-3.6.11/drivers/misc/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-03-19 15:30:55.443929856 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-02-28 04:23:39.671538729 +0100 @@ -50,3 +50,4 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ @@ -11444,7 +11276,7 @@ diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makef +obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-03-19 15:30:55.557929030 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11776,7 +11608,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/co +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-03-19 15:30:55.556929037 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11984,7 +11816,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_driver +/****************************** End of file ***********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-03-19 15:30:55.557929030 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12212,7 +12044,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-03-19 15:30:55.556929037 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12287,7 +12119,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +#endif /*VCHI_CFG_INTERNAL_H_*/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-03-19 15:30:55.556929037 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12454,7 +12286,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h +#endif // VCHI_COMMON_H_ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-03-19 15:30:55.556929037 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,373 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12831,7 +12663,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-r +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-03-19 15:30:55.556929037 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-02-28 04:23:39.694538639 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12877,7 +12709,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,538 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13419,7 +13251,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13465,7 +13297,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#endif /* VCHIQ_2835_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,2802 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16271,7 +16103,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,212 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16487,7 +16319,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +#endif /* VCHIQ_ARM_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16528,7 +16360,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_bui +const char *vchiq_get_build_date(void); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16592,7 +16424,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif /* VCHIQ_CFG_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,119 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16715,7 +16547,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +EXPORT_SYMBOL(vchiq_add_connected_callback); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16770,7 +16602,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-03-19 15:30:55.674928181 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,3818 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20592,7 +20424,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-03-19 15:30:55.557929030 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,703 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21299,7 +21131,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-03-19 15:30:55.557929030 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + @@ -21392,7 +21224,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_gen + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-02-28 04:23:39.686538670 +0100 @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21437,7 +21269,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-03-19 15:30:55.674928181 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,185 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21626,7 +21458,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +#endif /* VCHIQ_IF_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21759,7 +21591,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-02-28 04:23:39.691538650 +0100 @@ -0,0 +1,454 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22217,7 +22049,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-03-19 15:30:55.674928181 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-02-28 04:23:39.693538643 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22292,7 +22124,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22354,7 +22186,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +#endif /* VCHIQ_PAGELIST_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-03-19 15:30:55.674928181 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-02-28 04:23:39.688538663 +0100 @@ -0,0 +1,240 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22598,7 +22430,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pro + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-03-19 15:30:55.557929030 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-02-28 04:23:39.692538647 +0100 @@ -0,0 +1,815 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23417,7 +23249,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +EXPORT_SYMBOL(vchi_service_release); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23541,7 +23373,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-03-19 15:30:55.674928181 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-02-28 04:23:39.689538659 +0100 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23627,7 +23459,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-03-19 15:30:55.673928188 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-02-28 04:23:39.687538667 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23690,7 +23522,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ver +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig --- linux-3.6.11/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-03-19 15:30:55.675928173 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-02-28 04:23:39.695538635 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -23704,7 +23536,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drive + diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile --- linux-3.6.11/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-03-19 15:30:55.555929044 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-02-28 04:23:39.685538674 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -23726,7 +23558,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/driv + diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card/block.c --- linux-3.6.11/drivers/mmc/card/block.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-03-19 15:30:49.892970118 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-02-28 04:23:36.975549254 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -23738,7 +23570,7 @@ diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/car */ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd.c --- linux-3.6.11/drivers/mmc/core/sd.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-03-19 15:30:49.853970401 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-02-28 04:23:36.971549269 +0100 @@ -13,6 +13,8 @@ #include #include @@ -23899,7 +23731,7 @@ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/s * Fetch and process SD Status register. diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host/Kconfig --- linux-3.6.11/drivers/mmc/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-03-19 15:30:49.886970162 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-02-28 04:23:36.965549292 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -23930,7 +23762,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/hos depends on ARCH_OMAP diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/host/Makefile --- linux-3.6.11/drivers/mmc/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-03-19 15:30:49.875970241 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-02-28 04:23:36.959549316 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -23941,7 +23773,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/ho obj-$(CONFIG_MMC_OMAP) += omap.o diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-03-19 15:30:49.888970147 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-02-28 04:23:36.962549305 +0100 @@ -0,0 +1,1413 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -25358,7 +25190,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers + diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host/sdhci.c --- linux-3.6.11/drivers/mmc/host/sdhci.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-03-19 15:30:49.887970155 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-02-28 04:23:36.960549313 +0100 @@ -28,6 +28,7 @@ #include #include @@ -26231,7 +26063,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/hos sdhci_disable_card_detection(host); diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host/sdhci.h --- linux-3.6.11/drivers/mmc/host/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-03-19 15:30:49.864970321 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-02-28 04:23:36.966549289 +0100 @@ -275,6 +275,20 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -26294,7 +26126,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/hos #endif /* __SDHCI_HW_H */ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c --- linux-3.6.11/drivers/net/usb/smsc95xx.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-03-19 15:30:58.011911229 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-02-28 04:23:37.785546091 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -27311,7 +27143,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/u }; diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h --- linux-3.6.11/drivers/net/usb/smsc95xx.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-03-19 15:30:58.011911229 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-02-28 04:23:37.782546104 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -27352,7 +27184,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/u #define Tx_COE_EN_ (0x00010000) diff -Naur linux-3.6.11/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/usbnet.c --- linux-3.6.11/drivers/net/usb/usbnet.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-03-19 15:30:58.013911214 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-02-28 04:23:37.780546112 +0100 @@ -359,10 +359,12 @@ void usbnet_defer_kevent (struct usbnet *dev, int work) { @@ -27538,7 +27370,7 @@ diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c li diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/wlan0dhcp diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig --- linux-3.6.11/drivers/spi/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-03-19 15:30:51.024961908 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-02-28 04:23:36.903549535 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -27556,7 +27388,7 @@ diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig depends on BLACKFIN diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile --- linux-3.6.11/drivers/spi/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-03-19 15:30:50.715964149 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-02-28 04:23:36.897549558 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -27567,7 +27399,7 @@ diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefil obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c --- linux-3.6.11/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-03-19 15:30:50.775963714 +0100 ++++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-02-28 04:23:36.898549554 +0100 @@ -0,0 +1,600 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -28171,7 +28003,7 @@ diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/sp +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig --- linux-3.6.11/drivers/staging/media/lirc/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig 2013-03-19 15:31:07.246844230 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig 2013-02-28 04:23:38.473543405 +0100 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -28187,7 +28019,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drive depends on LIRC && USB diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c --- linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c 2013-03-19 15:31:07.245844237 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c 2013-02-28 04:23:38.474543402 +0100 @@ -0,0 +1,692 @@ +/* + * lirc_rpi.c @@ -28883,7 +28715,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/dr +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile --- linux-3.6.11/drivers/staging/media/lirc/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 2013-03-19 15:31:07.244844244 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 2013-02-28 04:23:38.472543409 +0100 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -28894,7 +28726,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/driv obj-$(CONFIG_LIRC_SIR) += lirc_sir.o diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c --- linux-3.6.11/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-03-19 15:30:55.735927738 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-02-28 04:23:39.657538784 +0100 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -29082,7 +28914,7 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver +module_platform_driver(bcm2835_thermal_driver); diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/Kconfig --- linux-3.6.11/drivers/thermal/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-03-19 15:30:55.735927738 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-02-28 04:23:39.658538780 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -29100,7 +28932,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/ + diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/Makefile --- linux-3.6.11/drivers/thermal/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-03-19 15:30:55.735927738 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-02-28 04:23:39.657538784 +0100 @@ -3,4 +3,5 @@ # @@ -29111,7 +28943,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal +obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/core/generic.c --- linux-3.6.11/drivers/usb/core/generic.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-03-19 15:30:54.313938053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-02-28 04:23:39.515539338 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -29122,7 +28954,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/c } diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/hub.c --- linux-3.6.11/drivers/usb/core/hub.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-03-19 15:30:54.313938053 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-02-28 04:23:39.517539330 +0100 @@ -25,7 +25,6 @@ #include #include @@ -29245,7 +29077,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/ !hcd->driver->port_handed_over || diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/core/message.c --- linux-3.6.11/drivers/usb/core/message.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-03-19 15:30:54.311938067 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-02-28 04:23:39.513539346 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -29334,7 +29166,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/c usb_unlocked_enable_lpm(dev); diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h --- linux-3.6.11/drivers/usb/core/otg_whitelist.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-03-19 15:30:54.314938046 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-02-28 04:23:39.513539346 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -29552,7 +29384,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c --- linux-3.6.11/drivers/usb/gadget/file_storage.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-03-19 15:30:54.154939206 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-02-28 04:23:39.510539357 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -29682,7 +29514,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/driver if (!req) diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/gadget/Kconfig --- linux-3.6.11/drivers/usb/gadget/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-03-19 15:30:54.183938996 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-02-28 04:23:39.505539378 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -29698,7 +29530,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/g # diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt --- linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-03-19 15:30:54.946933462 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -29876,7 +29708,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3 +library code directly into a driver module, instead of as a standalone module. diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-03-19 15:30:54.936933534 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -30150,7 +29982,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-r +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -30686,7 +30518,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6. +#endif /* DWC_CCLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -30915,7 +30747,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6. + diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-03-19 15:30:54.937933527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -32227,7 +32059,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -33652,7 +33484,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +#endif /* DWC_LIBMODULE */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-03-19 15:30:54.937933527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -34931,7 +34763,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-02-28 04:23:39.410539747 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -35243,7 +35075,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi- +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -35358,7 +35190,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi- +#endif /* _DWC_CRYPTO_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -35653,7 +35485,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6. +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-03-19 15:30:54.937933527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -35763,7 +35595,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6. +#endif /* _DWC_DH_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,594 @@ +/* $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 $ */ @@ -36361,7 +36193,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3. +#endif /* _DWC_LIST_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-03-19 15:30:54.937933527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -36610,7 +36442,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6 +#endif /* DWC_DEBUG_MEMORY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -37250,7 +37082,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi- +#endif /*DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -37288,7 +37120,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi- +#endif /* _LINUX_BIGNUM_H */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-03-19 15:30:54.946933462 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-02-28 04:23:39.411539743 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -37611,7 +37443,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rp +#endif /* DWC_NOTIFYLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -37737,7 +37569,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rp +#endif /* __DWC_NOTIFIER_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-02-28 04:23:39.413539736 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -39001,7 +38833,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6. +#endif /* _DWC_OS_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-03-19 15:30:54.937933527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-02-28 04:23:39.412539740 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -39063,7 +38895,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6. + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -39084,7 +38916,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi +.include diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-03-19 15:30:54.949933440 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-02-28 04:23:39.410539747 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -39137,7 +38969,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rp + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-03-19 15:30:54.948933447 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-02-28 04:23:39.414539733 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -40087,7 +39919,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/d +#endif /* _USB_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-03-19 15:30:55.023932903 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -40315,7 +40147,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-03-19 15:30:55.046932736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -41894,7 +41726,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/d +module_exit (cleanup); diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-03-19 15:30:55.026932881 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -42040,7 +41872,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -42898,7 +42730,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-03-19 15:30:55.047932729 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -42982,7 +42814,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/d +#endif //__DWC_OTG_ADP_H__ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-03-19 15:30:55.047932729 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -44196,7 +44028,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/ +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -44289,7 +44121,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-03-19 15:30:55.027932874 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -46169,7 +46001,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/d +#endif //DWC_UTE_CFI diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-03-19 15:30:55.026932881 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -46493,7 +46325,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/d +#endif /* (__DWC_OTG_CFI_H__) */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-03-19 15:30:55.028932867 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-02-28 04:23:39.088541004 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -53648,7 +53480,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-03-19 15:30:55.026932881 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -55116,7 +54948,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-03-19 15:30:55.028932867 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-02-28 04:23:39.079541040 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -56691,7 +56523,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-03-19 15:30:55.026932881 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-02-28 04:23:39.084541020 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -57400,7 +57232,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6 +#endif /* __DWC_CORE_IF_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-03-19 15:30:55.047932729 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -57521,7 +57353,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-03-19 15:30:55.046932736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-02-28 04:23:39.081541032 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -59257,7 +59089,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6. +*/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-03-19 15:30:55.040932780 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-02-28 04:23:39.080541036 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -59347,7 +59179,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-03-19 15:30:55.040932780 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-02-28 04:23:39.083541024 +0100 @@ -0,0 +1,3493 @@ + +/* ========================================================================== @@ -62844,7 +62676,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -63980,7 +63812,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-03-19 15:30:55.027932874 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-02-28 04:23:39.076541051 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -64813,7 +64645,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-03-19 15:30:55.024932896 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -65234,8 +65066,8 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-03-19 15:30:55.046932736 +0100 -@@ -0,0 +1,2258 @@ ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-02-28 04:23:39.080541036 +0100 +@@ -0,0 +1,2248 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ + * $Revision: #89 $ @@ -67159,20 +66991,13 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + dwc_otg_qtd_t * qtd) +{ + DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: " -+ "Data Toggle Error on %s transfer--\n", -+ hc->hc_num, (hc->ep_is_in ? "IN" : "OUT")); ++ "Data Toggle Error--\n", hc->hc_num); + -+ /* Data toggles on split transactions cause the hc to halt. -+ * restart transfer */ -+ if(hc->qh->do_split) -+ { -+ qtd->error_count++; -+ dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd); -+ update_urb_state_xfer_intr(hc, hc_regs, -+ qtd->urb, qtd, DWC_OTG_HC_XFER_XACT_ERR); -+ halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR); -+ } else if (hc->ep_is_in) { ++ if (hc->ep_is_in) { + qtd->error_count = 0; ++ } else { ++ DWC_ERROR("Data Toggle Error on OUT transfer," ++ "channel %d\n", hc->hc_num); + } + + disable_hc_int(hc_regs, datatglerr); @@ -67325,8 +67150,6 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + handle_hc_babble_intr(hcd, hc, hc_regs, qtd); + } else if (hcint.b.frmovrun) { + handle_hc_frmovrun_intr(hcd, hc, hc_regs, qtd); -+ } else if (hcint.b.datatglerr) { -+ handle_hc_datatglerr_intr(hcd, hc, hc_regs, qtd); + } else if (!out_nak_enh) { + if (hcint.b.nyet) { + /* @@ -67470,8 +67293,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + retval |= handle_hc_nak_intr(dwc_otg_hcd, hc, hc_regs, qtd); + } + if (hcint.b.ack) { -+ if(!hcint.b.chhltd) -+ retval |= handle_hc_ack_intr(dwc_otg_hcd, hc, hc_regs, qtd); ++ retval |= handle_hc_ack_intr(dwc_otg_hcd, hc, hc_regs, qtd); + } + if (hcint.b.nyet) { + retval |= handle_hc_nyet_intr(dwc_otg_hcd, hc, hc_regs, qtd); @@ -67496,7 +67318,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -68438,7 +68260,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-02-28 04:23:39.079541040 +0100 @@ -0,0 +1,958 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -69400,7 +69222,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-02-28 04:23:39.078541044 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -69517,7 +69339,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -69557,7 +69379,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-02-28 04:23:39.087541009 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -69749,7 +69571,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6. +#endif /* _DWC_OS_DEP_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-03-19 15:30:55.047932729 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-02-28 04:23:39.080541036 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -72461,7 +72283,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -72731,7 +72553,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-03-19 15:30:55.029932859 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -73095,7 +72917,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-03-19 15:30:55.038932794 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-02-28 04:23:39.081541032 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -78246,7 +78068,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-02-28 04:23:39.085541017 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -79624,7 +79446,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-03-19 15:30:55.048932722 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-02-28 04:23:39.082541028 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -82178,7 +82000,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-02-28 04:23:39.077541047 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -82263,7 +82085,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/driver +endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm --- linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -82604,7 +82426,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi- +1; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-03-19 15:30:55.024932896 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -82624,7 +82446,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/d + done diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-03-19 15:30:55.025932888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -82761,7 +82583,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rp +0; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-03-19 15:30:55.024932896 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-02-28 04:23:39.086541013 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -82958,7 +82780,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3. +0; diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host/Kconfig --- linux-3.6.11/drivers/usb/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-03-19 15:30:54.961933353 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-02-28 04:23:39.422539701 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -82981,7 +82803,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/hos depends on USB && ARM && ARCH_MXC diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/host/Makefile --- linux-3.6.11/drivers/usb/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-03-19 15:30:54.619935833 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-02-28 04:23:39.404539771 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -82993,7 +82815,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/ho obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile --- linux-3.6.11/drivers/usb/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-03-19 15:30:54.199938880 +0100 ++++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-02-28 04:23:39.440539631 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -83002,52 +82824,9 @@ diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefil obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ -diff -Naur linux-3.6.11/drivers/usb/serial/cp210x.c linux-rpi-3.6.y/drivers/usb/serial/cp210x.c ---- linux-3.6.11/drivers/usb/serial/cp210x.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/serial/cp210x.c 2013-03-19 15:30:54.257938459 +0100 -@@ -67,6 +67,7 @@ - { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ - { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ - { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */ -+ { USB_DEVICE(0x0FDE, 0xCA05) }, /* OWL Wireless Electricity Monitor CM-160 */ - { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ - { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ - { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ -diff -Naur linux-3.6.11/drivers/usb/serial/option.c linux-rpi-3.6.y/drivers/usb/serial/option.c ---- linux-3.6.11/drivers/usb/serial/option.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/serial/option.c 2013-03-19 15:30:54.279938299 +0100 -@@ -289,6 +289,7 @@ - #define ALCATEL_VENDOR_ID 0x1bbb - #define ALCATEL_PRODUCT_X060S_X200 0x0000 - #define ALCATEL_PRODUCT_X220_X500D 0x0017 -+#define ALCATEL_PRODUCT_L100V 0x011e - - #define PIRELLI_VENDOR_ID 0x1266 - #define PIRELLI_PRODUCT_C100_1 0x1002 -@@ -1191,6 +1192,8 @@ - .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist - }, - { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, -+ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), -+ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, - { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, - { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, - { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), -diff -Naur linux-3.6.11/drivers/usb/storage/unusual_cypress.h linux-rpi-3.6.y/drivers/usb/storage/unusual_cypress.h ---- linux-3.6.11/drivers/usb/storage/unusual_cypress.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/storage/unusual_cypress.h 2013-03-19 15:30:54.348937799 +0100 -@@ -31,7 +31,7 @@ - "Cypress ISD-300LP", - USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), - --UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999, -+UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219, - "Super Top", - "USB 2.0 SATA BRIDGE", - USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/bcm2708_fb.c --- linux-3.6.11/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-03-19 15:30:52.351952284 +0100 ++++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-02-28 04:23:36.517551041 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -83542,7 +83321,7 @@ diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); diff -Naur linux-3.6.11/drivers/video/console/fbcon.c linux-rpi-3.6.y/drivers/video/console/fbcon.c --- linux-3.6.11/drivers/video/console/fbcon.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/console/fbcon.c 2013-03-19 15:30:52.764949288 +0100 ++++ linux-rpi-3.6.y/drivers/video/console/fbcon.c 2013-02-28 04:23:36.601550714 +0100 @@ -1242,8 +1242,16 @@ if (!height || !width) return; @@ -83563,7 +83342,7 @@ diff -Naur linux-3.6.11/drivers/video/console/fbcon.c linux-rpi-3.6.y/drivers/vi diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconfig --- linux-3.6.11/drivers/video/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-03-19 15:30:52.675949934 +0100 ++++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-02-28 04:23:36.619550644 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -83587,7 +83366,7 @@ diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kcon depends on FB && ARM && ARM_AMBA diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-03-19 15:30:53.031947352 +0100 ++++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-02-28 04:23:36.591550752 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -86076,7 +85855,7 @@ diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6. +0 0 0 0 0 0 0 0 0 diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Makefile --- linux-3.6.11/drivers/video/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Makefile 2013-03-19 15:30:52.343952342 +0100 ++++ linux-rpi-3.6.y/drivers/video/Makefile 2013-02-28 04:23:36.548550920 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -86085,794 +85864,9 @@ diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Mak obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o -diff -Naur linux-3.6.11/drivers/w1/masters/w1-gpio.c linux-rpi-3.6.y/drivers/w1/masters/w1-gpio.c ---- linux-3.6.11/drivers/w1/masters/w1-gpio.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/w1/masters/w1-gpio.c 2013-03-19 15:30:45.799999801 +0100 -@@ -18,6 +18,9 @@ - #include "../w1.h" - #include "../w1_int.h" - -+static int w1_gpio_pullup = 0; -+module_param_named(pullup, w1_gpio_pullup, int, 0); -+ - static void w1_gpio_write_bit_dir(void *data, u8 bit) - { - struct w1_gpio_platform_data *pdata = data; -@@ -42,6 +45,16 @@ - return gpio_get_value(pdata->pin) ? 1 : 0; - } - -+static void w1_gpio_bitbang_pullup(void *data, u8 on) -+{ -+ struct w1_gpio_platform_data *pdata = data; -+ -+ if (on) -+ gpio_direction_output(pdata->pin, 1); -+ else -+ gpio_direction_input(pdata->pin); -+} -+ - static int __init w1_gpio_probe(struct platform_device *pdev) - { - struct w1_bus_master *master; -@@ -70,6 +83,13 @@ - master->write_bit = w1_gpio_write_bit_dir; - } - -+ if (w1_gpio_pullup) -+ if (pdata->is_open_drain) -+ printk(KERN_ERR "w1-gpio 'pullup' option " -+ "doesn't work with open drain GPIO\n"); -+ else -+ master->bitbang_pullup = w1_gpio_bitbang_pullup; -+ - err = w1_add_master_device(master); - if (err) - goto free_gpio; -@@ -81,9 +101,9 @@ - - return 0; - -- free_gpio: -+free_gpio: - gpio_free(pdata->pin); -- free_master: -+free_master: - kfree(master); - - return err; -@@ -133,10 +153,10 @@ - - static struct platform_driver w1_gpio_driver = { - .driver = { -- .name = "w1-gpio", -- .owner = THIS_MODULE, -- }, -- .remove = __exit_p(w1_gpio_remove), -+ .name = "w1-gpio", -+ .owner = THIS_MODULE, -+ }, -+ .remove = __exit_p(w1_gpio_remove), - .suspend = w1_gpio_suspend, - .resume = w1_gpio_resume, - }; -diff -Naur linux-3.6.11/drivers/w1/w1.h linux-rpi-3.6.y/drivers/w1/w1.h ---- linux-3.6.11/drivers/w1/w1.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/w1/w1.h 2013-03-19 15:30:45.800999794 +0100 -@@ -22,16 +22,11 @@ - #ifndef __W1_H - #define __W1_H - --struct w1_reg_num --{ -+struct w1_reg_num { - #if defined(__LITTLE_ENDIAN_BITFIELD) -- __u64 family:8, -- id:48, -- crc:8; -+ __u64 family:8, id:48, crc:8; - #elif defined(__BIG_ENDIAN_BITFIELD) -- __u64 crc:8, -- id:48, -- family:8; -+ __u64 crc:8, id:48, family:8; - #else - #error "Please fix " - #endif -@@ -59,26 +54,24 @@ - - #define W1_SLAVE_ACTIVE 0 - --struct w1_slave --{ -- struct module *owner; -- unsigned char name[W1_MAXNAMELEN]; -- struct list_head w1_slave_entry; -- struct w1_reg_num reg_num; -- atomic_t refcnt; -- u8 rom[9]; -- u32 flags; -- int ttl; -- -- struct w1_master *master; -- struct w1_family *family; -- void *family_data; -- struct device dev; -- struct completion released; -+struct w1_slave { -+ struct module *owner; -+ unsigned char name[W1_MAXNAMELEN]; -+ struct list_head w1_slave_entry; -+ struct w1_reg_num reg_num; -+ atomic_t refcnt; -+ u8 rom[9]; -+ u32 flags; -+ int ttl; -+ -+ struct w1_master *master; -+ struct w1_family *family; -+ void *family_data; -+ struct device dev; -+ struct completion released; - }; - --typedef void (*w1_slave_found_callback)(struct w1_master *, u64); -- -+typedef void (*w1_slave_found_callback) (struct w1_master *, u64); - - /** - * Note: read_bit and write_bit are very low level functions and should only -@@ -87,19 +80,18 @@ - * Either define read_bit and write_bit OR define, at minimum, touch_bit and - * reset_bus. - */ --struct w1_bus_master --{ -+struct w1_bus_master { - /** the first parameter in all the functions below */ -- void *data; -+ void *data; - - /** - * Sample the line level - * @return the level read (0 or 1) - */ -- u8 (*read_bit)(void *); -+ u8(*read_bit) (void *); - - /** Sets the line level */ -- void (*write_bit)(void *, u8); -+ void (*write_bit) (void *, u8); - - /** - * touch_bit is the lowest-level function for devices that really -@@ -108,96 +100,103 @@ - * touch_bit(1) = write-1 / read cycle - * @return the bit read (0 or 1) - */ -- u8 (*touch_bit)(void *, u8); -+ u8(*touch_bit) (void *, u8); - - /** - * Reads a bytes. Same as 8 touch_bit(1) calls. - * @return the byte read - */ -- u8 (*read_byte)(void *); -+ u8(*read_byte) (void *); - - /** - * Writes a byte. Same as 8 touch_bit(x) calls. - */ -- void (*write_byte)(void *, u8); -+ void (*write_byte) (void *, u8); - - /** - * Same as a series of read_byte() calls - * @return the number of bytes read - */ -- u8 (*read_block)(void *, u8 *, int); -+ u8(*read_block) (void *, u8 *, int); - - /** Same as a series of write_byte() calls */ -- void (*write_block)(void *, const u8 *, int); -+ void (*write_block) (void *, const u8 *, int); - - /** - * Combines two reads and a smart write for ROM searches - * @return bit0=Id bit1=comp_id bit2=dir_taken - */ -- u8 (*triplet)(void *, u8); -+ u8(*triplet) (void *, u8); - - /** - * long write-0 with a read for the presence pulse detection - * @return -1=Error, 0=Device present, 1=No device present - */ -- u8 (*reset_bus)(void *); -+ u8(*reset_bus) (void *); - - /** - * Put out a strong pull-up pulse of the specified duration. - * @return -1=Error, 0=completed - */ -- u8 (*set_pullup)(void *, int); -+ u8(*set_pullup) (void *, int); -+ -+ /** -+ * Turns the pullup on/off in bitbanging mode, takes an on/off argument. -+ * @return -1=Error, 0=completed -+ */ -+ void (*bitbang_pullup) (void *, u8); - - /** Really nice hardware can handles the different types of ROM search - * w1_master* is passed to the slave found callback. - */ -- void (*search)(void *, struct w1_master *, -- u8, w1_slave_found_callback); -+ void (*search) (void *, struct w1_master *, -+ u8, w1_slave_found_callback); - }; - --struct w1_master --{ -- struct list_head w1_master_entry; -- struct module *owner; -- unsigned char name[W1_MAXNAMELEN]; -- struct list_head slist; -- int max_slave_count, slave_count; -- unsigned long attempts; -- int slave_ttl; -- int initialized; -- u32 id; -- int search_count; -+struct w1_master { -+ struct list_head w1_master_entry; -+ struct module *owner; -+ unsigned char name[W1_MAXNAMELEN]; -+ struct list_head slist; -+ int max_slave_count, slave_count; -+ unsigned long attempts; -+ int slave_ttl; -+ int initialized; -+ u32 id; -+ int search_count; - -- atomic_t refcnt; -+ atomic_t refcnt; - -- void *priv; -- int priv_size; -+ void *priv; -+ int priv_size; - - /** 5V strong pullup enabled flag, 1 enabled, zero disabled. */ -- int enable_pullup; -+ int enable_pullup; - /** 5V strong pullup duration in milliseconds, zero disabled. */ -- int pullup_duration; -+ int pullup_duration; - -- struct task_struct *thread; -- struct mutex mutex; -- struct mutex bus_mutex; -+ struct task_struct *thread; -+ struct mutex mutex; -+ struct mutex bus_mutex; - -- struct device_driver *driver; -- struct device dev; -+ struct device_driver *driver; -+ struct device dev; - -- struct w1_bus_master *bus_master; -+ struct w1_bus_master *bus_master; - -- u32 seq; -+ u32 seq; - }; - - int w1_create_master_attributes(struct w1_master *); - void w1_destroy_master_attributes(struct w1_master *master); --void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb); --void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb); -+void w1_search(struct w1_master *dev, u8 search_type, -+ w1_slave_found_callback cb); -+void w1_search_devices(struct w1_master *dev, u8 search_type, -+ w1_slave_found_callback cb); - struct w1_slave *w1_search_slave(struct w1_reg_num *id); - void w1_slave_found(struct w1_master *dev, u64 rn); - void w1_search_process_cb(struct w1_master *dev, u8 search_type, -- w1_slave_found_callback cb); -+ w1_slave_found_callback cb); - struct w1_master *w1_search_master_id(u32 id); - - /* Disconnect and reconnect devices in the given family. Used for finding -@@ -220,17 +219,17 @@ - int w1_reset_resume_command(struct w1_master *); - void w1_next_pullup(struct w1_master *, int); - --static inline struct w1_slave* dev_to_w1_slave(struct device *dev) -+static inline struct w1_slave *dev_to_w1_slave(struct device *dev) - { - return container_of(dev, struct w1_slave, dev); - } - --static inline struct w1_slave* kobj_to_w1_slave(struct kobject *kobj) -+static inline struct w1_slave *kobj_to_w1_slave(struct kobject *kobj) - { - return dev_to_w1_slave(container_of(kobj, struct device, kobj)); - } - --static inline struct w1_master* dev_to_w1_master(struct device *dev) -+static inline struct w1_master *dev_to_w1_master(struct device *dev) - { - return container_of(dev, struct w1_master, dev); - } -diff -Naur linux-3.6.11/drivers/w1/w1_int.c linux-rpi-3.6.y/drivers/w1/w1_int.c ---- linux-3.6.11/drivers/w1/w1_int.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/w1/w1_int.c 2013-03-19 15:30:45.800999794 +0100 -@@ -32,15 +32,15 @@ - #include "w1_netlink.h" - #include "w1_int.h" - --static int w1_search_count = -1; /* Default is continual scan */ -+static int w1_search_count = -1; /* Default is continual scan */ - module_param_named(search_count, w1_search_count, int, 0); - - static int w1_enable_pullup = 1; - module_param_named(enable_pullup, w1_enable_pullup, int, 0); - --static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, -- struct device_driver *driver, -- struct device *device) -+static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, -+ struct device_driver *driver, -+ struct device *device) - { - struct w1_master *dev; - int err; -@@ -48,26 +48,27 @@ - /* - * We are in process context(kernel thread), so can sleep. - */ -- dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); -+ dev = -+ kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), -+ GFP_KERNEL); - if (!dev) { - printk(KERN_ERR -- "Failed to allocate %zd bytes for new w1 device.\n", -- sizeof(struct w1_master)); -+ "Failed to allocate %zd bytes for new w1 device.\n", -+ sizeof(struct w1_master)); - return NULL; - } - -- - dev->bus_master = (struct w1_bus_master *)(dev + 1); - -- dev->owner = THIS_MODULE; -- dev->max_slave_count = slave_count; -- dev->slave_count = 0; -- dev->attempts = 0; -- dev->initialized = 0; -- dev->id = id; -- dev->slave_ttl = slave_ttl; -- dev->search_count = w1_search_count; -- dev->enable_pullup = w1_enable_pullup; -+ dev->owner = THIS_MODULE; -+ dev->max_slave_count = slave_count; -+ dev->slave_count = 0; -+ dev->attempts = 0; -+ dev->initialized = 0; -+ dev->id = id; -+ dev->slave_ttl = slave_ttl; -+ dev->search_count = w1_search_count; -+ dev->enable_pullup = w1_enable_pullup; - - /* 1 for w1_process to decrement - * 1 for __w1_remove_master_device to decrement -@@ -89,7 +90,8 @@ - - err = device_register(&dev->dev); - if (err) { -- printk(KERN_ERR "Failed to register master device. err=%d\n", err); -+ printk(KERN_ERR "Failed to register master device. err=%d\n", -+ err); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); - dev = NULL; -@@ -110,23 +112,25 @@ - struct w1_netlink_msg msg; - int id, found; - -- /* validate minimum functionality */ -- if (!(master->touch_bit && master->reset_bus) && -- !(master->write_bit && master->read_bit) && -+ /* validate minimum functionality */ -+ if (!(master->touch_bit && master->reset_bus) && -+ !(master->write_bit && master->read_bit) && - !(master->write_byte && master->read_byte && master->reset_bus)) { - printk(KERN_ERR "w1_add_master_device: invalid function set\n"); -- return(-EINVAL); -- } -- /* While it would be electrically possible to make a device that -- * generated a strong pullup in bit bang mode, only hardware that -- * controls 1-wire time frames are even expected to support a strong -- * pullup. w1_io.c would need to support calling set_pullup before -- * the last write_bit operation of a w1_write_8 which it currently -- * doesn't. -- */ -+ return (-EINVAL); -+ } -+ -+ /* bitbanging hardware uses bitbang_pullup, other hardware uses set_pullup -+ * and takes care of timing itself */ - if (!master->write_byte && !master->touch_bit && master->set_pullup) { - printk(KERN_ERR "w1_add_master_device: set_pullup requires " -- "write_byte or touch_bit, disabling\n"); -+ "write_byte or touch_bit, disabling\n"); -+ master->set_pullup = NULL; -+ } -+ -+ if (master->set_pullup && master->bitbang_pullup) { -+ printk(KERN_ERR "w1_add_master_device: set_pullup should not " -+ "be set when bitbang_pullup is used, disabling\n"); - master->set_pullup = NULL; - } - -@@ -146,13 +150,13 @@ - } while (found); - - dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl, -- &w1_master_driver, &w1_master_device); -+ &w1_master_driver, &w1_master_device); - if (!dev) { - mutex_unlock(&w1_mlock); - return -ENOMEM; - } - -- retval = w1_create_master_attributes(dev); -+ retval = w1_create_master_attributes(dev); - if (retval) { - mutex_unlock(&w1_mlock); - goto err_out_free_dev; -@@ -166,8 +170,7 @@ - if (IS_ERR(dev->thread)) { - retval = PTR_ERR(dev->thread); - dev_err(&dev->dev, -- "Failed to create new kernel thread. err=%d\n", -- retval); -+ "Failed to create new kernel thread. err=%d\n", retval); - mutex_unlock(&w1_mlock); - goto err_out_rm_attr; - } -@@ -182,7 +185,7 @@ - - return 0; - --#if 0 /* Thread cleanup code, not required currently. */ -+#if 0 /* Thread cleanup code, not required currently. */ - err_out_kill_thread: - kthread_stop(dev->thread); - #endif -@@ -207,14 +210,15 @@ - - mutex_lock(&dev->mutex); - list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) -- w1_slave_detach(sl); -+ w1_slave_detach(sl); - w1_destroy_master_attributes(dev); - mutex_unlock(&dev->mutex); - atomic_dec(&dev->refcnt); - - while (atomic_read(&dev->refcnt)) { -- dev_info(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n", -- dev->name, atomic_read(&dev->refcnt)); -+ dev_info(&dev->dev, -+ "Waiting for %s to become free: refcnt=%d.\n", -+ dev->name, atomic_read(&dev->refcnt)); - - if (msleep_interruptible(1000)) - flush_signals(current); -diff -Naur linux-3.6.11/drivers/w1/w1_io.c linux-rpi-3.6.y/drivers/w1/w1_io.c ---- linux-3.6.11/drivers/w1/w1_io.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/w1/w1_io.c 2013-03-19 15:30:45.791999859 +0100 -@@ -43,14 +43,15 @@ - 219, 133, 103, 57, 186, 228, 6, 88, 25, 71, 165, 251, 120, 38, 196, 154, - 101, 59, 217, 135, 4, 90, 184, 230, 167, 249, 27, 69, 198, 152, 122, 36, - 248, 166, 68, 26, 153, 199, 37, 123, 58, 100, 134, 216, 91, 5, 231, 185, -- 140, 210, 48, 110, 237, 179, 81, 15, 78, 16, 242, 172, 47, 113, 147, 205, -- 17, 79, 173, 243, 112, 46, 204, 146, 211, 141, 111, 49, 178, 236, 14, 80, -- 175, 241, 19, 77, 206, 144, 114, 44, 109, 51, 209, 143, 12, 82, 176, 238, -- 50, 108, 142, 208, 83, 13, 239, 177, 240, 174, 76, 18, 145, 207, 45, 115, -- 202, 148, 118, 40, 171, 245, 23, 73, 8, 86, 180, 234, 105, 55, 213, 139, -- 87, 9, 235, 181, 54, 104, 138, 212, 149, 203, 41, 119, 244, 170, 72, 22, -- 233, 183, 85, 11, 136, 214, 52, 106, 43, 117, 151, 201, 74, 20, 246, 168, -- 116, 42, 200, 150, 21, 75, 169, 247, 182, 232, 10, 84, 215, 137, 107, 53 -+ 140, 210, 48, 110, 237, 179, 81, 15, 78, 16, 242, 172, 47, 113, 147, -+ 205, 17, 79, 173, 243, 112, 46, 204, 146, 211, 141, 111, 49, 178, -+ 236, 14, 80, 175, 241, 19, 77, 206, 144, 114, 44, 109, 51, 209, 143, -+ 12, 82, 176, 238, 50, 108, 142, 208, 83, 13, 239, 177, 240, 174, 76, -+ 18, 145, 207, 45, 115, 202, 148, 118, 40, 171, 245, 23, 73, 8, 86, -+ 180, 234, 105, 55, 213, 139, 87, 9, 235, 181, 54, 104, 138, 212, -+ 149, 203, 41, 119, 244, 170, 72, 22, 233, 183, 85, 11, 136, 214, 52, -+ 106, 43, 117, 151, 201, 74, 20, 246, 168, 116, 42, 200, 150, 21, 75, -+ 169, 247, 182, 232, 10, 84, 215, 137, 107, 53 - }; - - static void w1_delay(unsigned long tm) -@@ -84,7 +85,8 @@ - { - unsigned long flags = 0; - -- if(w1_disable_irqs) local_irq_save(flags); -+ if (w1_disable_irqs) -+ local_irq_save(flags); - - if (bit) { - dev->bus_master->write_bit(dev->bus_master->data, 0); -@@ -98,7 +100,8 @@ - w1_delay(10); - } - -- if(w1_disable_irqs) local_irq_restore(flags); -+ if (w1_disable_irqs) -+ local_irq_restore(flags); - } - - /** -@@ -111,9 +114,9 @@ - static void w1_pre_write(struct w1_master *dev) - { - if (dev->pullup_duration && -- dev->enable_pullup && dev->bus_master->set_pullup) { -+ dev->enable_pullup && dev->bus_master->set_pullup) { - dev->bus_master->set_pullup(dev->bus_master->data, -- dev->pullup_duration); -+ dev->pullup_duration); - } - } - -@@ -127,10 +130,22 @@ - static void w1_post_write(struct w1_master *dev) - { - if (dev->pullup_duration) { -- if (dev->enable_pullup && dev->bus_master->set_pullup) -- dev->bus_master->set_pullup(dev->bus_master->data, 0); -- else -+ if (dev->enable_pullup) { -+ if (dev->bus_master->set_pullup) { -+ dev->bus_master->set_pullup(dev-> -+ bus_master->data, -+ 0); -+ } else if (dev->bus_master->bitbang_pullup) { -+ dev->bus_master-> -+ bitbang_pullup(dev->bus_master->data, 1); -+ msleep(dev->pullup_duration); -+ dev->bus_master-> -+ bitbang_pullup(dev->bus_master->data, 0); -+ } -+ } else { - msleep(dev->pullup_duration); -+ } -+ - dev->pullup_duration = 0; - } - } -@@ -148,8 +163,7 @@ - if (dev->bus_master->write_byte) { - w1_pre_write(dev); - dev->bus_master->write_byte(dev->bus_master->data, byte); -- } -- else -+ } else - for (i = 0; i < 8; ++i) { - if (i == 7) - w1_pre_write(dev); -@@ -157,8 +171,8 @@ - } - w1_post_write(dev); - } --EXPORT_SYMBOL_GPL(w1_write_8); - -+EXPORT_SYMBOL_GPL(w1_write_8); - - /** - * Generates a write-1 cycle and samples the level. -@@ -196,17 +210,17 @@ - * @param bdir the bit to write if both id_bit and comp_bit are 0 - * @return bit fields - see above - */ --u8 w1_triplet(struct w1_master *dev, int bdir) -+u8 w1_triplet(struct w1_master * dev, int bdir) - { - if (dev->bus_master->triplet) - return dev->bus_master->triplet(dev->bus_master->data, bdir); - else { -- u8 id_bit = w1_touch_bit(dev, 1); -+ u8 id_bit = w1_touch_bit(dev, 1); - u8 comp_bit = w1_touch_bit(dev, 1); - u8 retval; - - if (id_bit && comp_bit) -- return 0x03; /* error */ -+ return 0x03; /* error */ - - if (!id_bit && !comp_bit) { - /* Both bits are valid, take the direction given */ -@@ -231,7 +245,7 @@ - * @param dev the master device - * @return the byte read - */ --u8 w1_read_8(struct w1_master *dev) -+u8 w1_read_8(struct w1_master * dev) - { - int i; - u8 res = 0; -@@ -240,10 +254,11 @@ - res = dev->bus_master->read_byte(dev->bus_master->data); - else - for (i = 0; i < 8; ++i) -- res |= (w1_touch_bit(dev,1) << i); -+ res |= (w1_touch_bit(dev, 1) << i); - - return res; - } -+ - EXPORT_SYMBOL_GPL(w1_read_8); - - /** -@@ -253,19 +268,19 @@ - * @param buf pointer to the data to write - * @param len the number of bytes to write - */ --void w1_write_block(struct w1_master *dev, const u8 *buf, int len) -+void w1_write_block(struct w1_master *dev, const u8 * buf, int len) - { - int i; - - if (dev->bus_master->write_block) { - w1_pre_write(dev); - dev->bus_master->write_block(dev->bus_master->data, buf, len); -- } -- else -+ } else - for (i = 0; i < len; ++i) -- w1_write_8(dev, buf[i]); /* calls w1_pre_write */ -+ w1_write_8(dev, buf[i]); /* calls w1_pre_write */ - w1_post_write(dev); - } -+ - EXPORT_SYMBOL_GPL(w1_write_block); - - /** -@@ -275,7 +290,7 @@ - * @param buf pointer to the data to write - * @param len the number of bytes to write - */ --void w1_touch_block(struct w1_master *dev, u8 *buf, int len) -+void w1_touch_block(struct w1_master *dev, u8 * buf, int len) - { - int i, j; - u8 tmp; -@@ -291,6 +306,7 @@ - buf[i] = tmp; - } - } -+ - EXPORT_SYMBOL_GPL(w1_touch_block); - - /** -@@ -301,13 +317,15 @@ - * @param len the number of bytes to read - * @return the number of bytes read - */ --u8 w1_read_block(struct w1_master *dev, u8 *buf, int len) -+u8 w1_read_block(struct w1_master *dev, u8 * buf, int len) - { - int i; - u8 ret; - - if (dev->bus_master->read_block) -- ret = dev->bus_master->read_block(dev->bus_master->data, buf, len); -+ ret = -+ dev->bus_master->read_block(dev->bus_master->data, buf, -+ len); - else { - for (i = 0; i < len; ++i) - buf[i] = w1_read_8(dev); -@@ -316,6 +334,7 @@ - - return ret; - } -+ - EXPORT_SYMBOL_GPL(w1_read_block); - - /** -@@ -329,10 +348,12 @@ - int result; - unsigned long flags = 0; - -- if(w1_disable_irqs) local_irq_save(flags); -+ if (w1_disable_irqs) -+ local_irq_save(flags); - - if (dev->bus_master->reset_bus) -- result = dev->bus_master->reset_bus(dev->bus_master->data) & 0x1; -+ result = -+ dev->bus_master->reset_bus(dev->bus_master->data) & 0x1; - else { - dev->bus_master->write_bit(dev->bus_master->data, 0); - /* minimum 480, max ? us -@@ -355,10 +376,12 @@ - msleep(1); - } - -- if(w1_disable_irqs) local_irq_restore(flags); -+ if (w1_disable_irqs) -+ local_irq_restore(flags); - - return result; - } -+ - EXPORT_SYMBOL_GPL(w1_reset_bus); - - u8 w1_calc_crc8(u8 * data, int len) -@@ -370,14 +393,16 @@ - - return crc; - } -+ - EXPORT_SYMBOL_GPL(w1_calc_crc8); - --void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb) -+void w1_search_devices(struct w1_master *dev, u8 search_type, -+ w1_slave_found_callback cb) - { - dev->attempts++; - if (dev->bus_master->search) - dev->bus_master->search(dev->bus_master->data, dev, -- search_type, cb); -+ search_type, cb); - else - w1_search(dev, search_type, cb); - } -@@ -398,14 +423,15 @@ - if (sl->master->slave_count == 1) - w1_write_8(sl->master, W1_SKIP_ROM); - else { -- u8 match[9] = {W1_MATCH_ROM, }; -- u64 rn = le64_to_cpu(*((u64*)&sl->reg_num)); -+ u8 match[9] = { W1_MATCH_ROM, }; -+ u64 rn = le64_to_cpu(*((u64 *) & sl->reg_num)); - - memcpy(&match[1], &rn, 8); - w1_write_block(sl->master, match, 9); - } - return 0; - } -+ - EXPORT_SYMBOL_GPL(w1_reset_select_slave); - - /** -@@ -432,6 +458,7 @@ - w1_write_8(dev, W1_RESUME_CMD); - return 0; - } -+ - EXPORT_SYMBOL_GPL(w1_reset_resume_command); - - /** -@@ -449,4 +476,5 @@ - { - dev->pullup_duration = delay; - } -+ - EXPORT_SYMBOL_GPL(w1_next_pullup); diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c --- linux-3.6.11/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-03-19 15:31:01.647884852 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-02-28 04:23:40.165536800 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -87261,7 +86255,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/ + diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog/Kconfig --- linux-3.6.11/drivers/watchdog/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-03-19 15:31:01.742884162 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-02-28 04:23:40.185536723 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -87277,7 +86271,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdo config AT32AP700X_WDT diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdog/Makefile --- linux-3.6.11/drivers/watchdog/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-03-19 15:31:01.735884213 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-02-28 04:23:40.149536862 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -87288,7 +86282,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchd obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h --- linux-3.6.11/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-03-19 15:30:45.304003398 +0100 ++++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-02-28 04:23:28.681581633 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -87322,7 +86316,7 @@ diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/ + diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mmc/host.h --- linux-3.6.11/include/linux/mmc/host.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-03-19 15:30:41.186033259 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-02-28 04:23:28.637581805 +0100 @@ -257,6 +257,7 @@ #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ @@ -87333,7 +86327,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/m unsigned int power_notify_type; diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/mmc/sdhci.h --- linux-3.6.11/include/linux/mmc/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-03-19 15:30:41.184033274 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-02-28 04:23:28.639581797 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -87360,7 +86354,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/bluetooth/hci.h --- linux-3.6.11/include/net/bluetooth/hci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-03-19 15:30:45.517001854 +0100 ++++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-02-28 04:23:28.955580564 +0100 @@ -142,7 +142,7 @@ #define HCI_DISCONN_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ #define HCI_PAIRING_TIMEOUT msecs_to_jiffies(60000) /* 60 seconds */ @@ -87372,7 +86366,7 @@ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c --- linux-3.6.11/kernel/module.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/kernel/module.c 2013-03-19 15:30:13.291235451 +0100 ++++ linux-rpi-3.6.y/kernel/module.c 2013-02-28 04:23:27.986584347 +0100 @@ -2680,20 +2680,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -87412,7 +86406,7 @@ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c pr_debug("final section addresses:\n"); diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c --- linux-3.6.11/net/core/skbuff.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/net/core/skbuff.c 2013-03-19 15:31:08.738833404 +0100 ++++ linux-rpi-3.6.y/net/core/skbuff.c 2013-02-28 04:23:28.190583549 +0100 @@ -340,43 +340,57 @@ EXPORT_SYMBOL(build_skb); @@ -87489,7 +86483,7 @@ diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c local_irq_restore(flags); diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c --- linux-3.6.11/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-02-28 04:23:29.322579131 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87906,7 +86900,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c +MODULE_ALIAS("platform:bcm2835_alsa"); diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c --- linux-3.6.11/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-03-19 15:30:28.239127122 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-02-28 04:23:29.321579135 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -88110,7 +87104,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h --- linux-3.6.11/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-03-19 15:30:28.239127122 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-02-28 04:23:29.320579139 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -88269,7 +87263,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h +#endif /* __SOUND_ARM_BCM2835_H */ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c --- linux-3.6.11/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-02-28 04:23:29.319579142 +0100 @@ -0,0 +1,409 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -88300,7 +87294,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm283 + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 32 * 1024, /* Needs to be less than audioplay buffer size */ -+ .period_bytes_min = 4 * 1024, ++ .period_bytes_min = 1 * 1024, + .period_bytes_max = 32 * 1024, + .periods_min = 1, + .periods_max = 32, @@ -88682,7 +87676,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c --- linux-3.6.11/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-02-28 04:23:29.321579135 +0100 @@ -0,0 +1,844 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -89530,7 +88524,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2 +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig --- linux-3.6.11/sound/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-02-28 04:23:29.322579131 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -89546,7 +88540,7 @@ diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile --- linux-3.6.11/sound/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Makefile 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/Makefile 2013-02-28 04:23:29.320579139 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -89559,7 +88553,7 @@ diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile + diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-03-19 15:30:28.238127129 +0100 ++++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-02-28 04:23:29.322579131 +0100 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -89679,7 +88673,7 @@ diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound +#endif // _VC_AUDIO_DEFS_H_ diff -Naur linux-3.6.11/sound/pci/Kconfig linux-rpi-3.6.y/sound/pci/Kconfig --- linux-3.6.11/sound/pci/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-03-19 15:30:29.023121439 +0100 ++++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-02-28 04:23:29.449578634 +0100 @@ -2,8 +2,8 @@ config SND_TEA575X