diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-28 20:42:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-28 20:43:03 +0200 |
| commit | d88600f00056338fbfda09a8844ac6bba90a8f5b (patch) | |
| tree | 7cdfd5d04f3a943789b525e343a8a85e3ed110c2 /target | |
| parent | 50dad34d870d75ad047f35527c118d2c76cb6907 (diff) | |
fix patch after kernel update
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch | 2085 |
1 files changed, 970 insertions, 1115 deletions
diff --git a/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch b/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch index b075978cf..41a1d43cf 100644 --- a/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch +++ b/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-07-25 15:20:15.964620686 +0200 @@ -0,0 +1,503 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -505,9 +505,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/ +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_BCM2708=m -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_defconfig 2014-07-25 15:20:15.968620714 +0200 @@ -0,0 +1,1099 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_LOCALVERSION_AUTO is not set @@ -1608,9 +1608,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/conf +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_emergency_defconfig 2014-07-25 15:20:15.972620744 +0200 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2144,9 +2144,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arc +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_quick_defconfig 2014-07-25 15:20:15.972620744 +0200 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -2345,9 +2345,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/ar +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h ---- linux-3.15.4/arch/arm/include/asm/irqflags.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/include/asm/irqflags.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/include/asm/irqflags.h linux-3.15.6/arch/arm/include/asm/irqflags.h +--- linux-3.15.6.orig/arch/arm/include/asm/irqflags.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/include/asm/irqflags.h 2014-07-25 15:20:15.972620744 +0200 @@ -145,12 +145,22 @@ } @@ -2374,9 +2374,9 @@ diff -Nur linux-3.15.4/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/includ : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.15.4/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-3.15.4/arch/arm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Kconfig linux-3.15.6/arch/arm/Kconfig +--- linux-3.15.6.orig/arch/arm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Kconfig 2014-07-25 15:20:16.256622767 +0200 @@ -384,6 +384,24 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -2410,9 +2410,9 @@ diff -Nur linux-3.15.4/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.15.4/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-3.15.4/arch/arm/Kconfig.debug 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig.debug 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Kconfig.debug linux-3.15.6/arch/arm/Kconfig.debug +--- linux-3.15.6.orig/arch/arm/Kconfig.debug 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Kconfig.debug 2014-07-25 15:20:16.260622796 +0200 @@ -916,6 +916,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -2428,9 +2428,9 @@ diff -Nur linux-3.15.4/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.15.4/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-3.15.4/arch/arm/kernel/fiqasm.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/kernel/fiqasm.S linux-3.15.6/arch/arm/kernel/fiqasm.S +--- linux-3.15.6.orig/arch/arm/kernel/fiqasm.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/kernel/fiqasm.S 2014-07-25 15:20:16.260622796 +0200 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2439,9 +2439,9 @@ diff -Nur linux-3.15.4/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.15.4/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c ---- linux-3.15.4/arch/arm/kernel/process.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/process.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/kernel/process.c linux-3.15.6/arch/arm/kernel/process.c +--- linux-3.15.6.orig/arch/arm/kernel/process.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/kernel/process.c 2014-07-25 15:20:16.260622796 +0200 @@ -171,6 +171,16 @@ } #endif @@ -2459,9 +2459,9 @@ diff -Nur linux-3.15.4/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proce /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.15.6/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/armctrl.c 2014-07-25 15:20:16.260622796 +0200 @@ -0,0 +1,219 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2682,9 +2682,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-b + init_FIQ(FIQ_START); + return 0; +} -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.15.6/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/armctrl.h 2014-07-25 15:20:16.264622825 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2713,9 +2713,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.c 2014-07-25 15:20:16.264622825 +0200 @@ -0,0 +1,1031 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3748,9 +3748,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-b +module_param(reboot_part, uint, 0644); +module_param(w1_gpio_pin, uint, 0644); +module_param(w1_gpio_pullup, uint, 0644); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.15.4/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-06-29 11:34:17.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.15.6/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,361 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4113,9 +4113,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.h 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4166,9 +4166,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c ---- linux-3.15.4/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.15.6/arch/arm/mach-bcm2708/clock.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/clock.c 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4231,9 +4231,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h ---- linux-3.15.4/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.15.6/arch/arm/mach-bcm2708/clock.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/clock.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4259,9 +4259,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c ---- linux-3.15.4/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.15.6/arch/arm/mach-bcm2708/dma.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/dma.c 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,407 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4670,9 +4670,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm27 +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5093,9 +5093,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rp +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5157,9 +5157,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/ +}; + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5168,9 +5168,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.15.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5194,9 +5194,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/dma.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,90 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5288,9 +5288,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/a + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.15.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5361,9 +5361,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rp +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/frc.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5403,9 +5403,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5424,9 +5424,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-07-25 15:20:16.456624194 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5456,9 +5456,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/a +#include <mach/platform.h> + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/io.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5487,9 +5487,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,197 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5688,9 +5688,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (HARD_IRQS+FIQ_IRQS+GPIO_IRQS+SPARE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/memory.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5749,9 +5749,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/platform.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -5981,9 +5981,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/power.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6011,9 +6011,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/system.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6053,9 +6053,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/timex.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6080,9 +6080,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6168,9 +6168,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6313,9 +6313,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/ +#define DEVICE_FILE_NAME "char_dev" + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6352,9 +6352,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arc +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6376,9 +6376,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig ---- linux-3.15.4/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Kconfig linux-3.15.6/arch/arm/mach-bcm2708/Kconfig +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Kconfig 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6421,9 +6421,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile ---- linux-3.15.4/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile linux-3.15.6/arch/arm/mach-bcm2708/Makefile +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Makefile 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -6432,16 +6432,16 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bc +obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.15.4/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.15.6/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Makefile.boot 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c ---- linux-3.15.4/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/power.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/power.c linux-3.15.6/arch/arm/mach-bcm2708/power.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/power.c 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -6637,9 +6637,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c ---- linux-3.15.4/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/vcio.c linux-3.15.6/arch/arm/mach-bcm2708/vcio.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/vcio.c 2014-07-25 15:20:16.552624878 +0200 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7115,9 +7115,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.15.4/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.15.6/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/vc_mem.c 2014-07-25 15:20:16.552624878 +0200 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7551,9 +7551,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bc +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.15.4/arch/arm/Makefile linux-rpi/arch/arm/Makefile ---- linux-3.15.4/arch/arm/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Makefile 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Makefile linux-3.15.6/arch/arm/Makefile +--- linux-3.15.6.orig/arch/arm/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Makefile 2014-07-25 15:20:16.552624878 +0200 @@ -143,6 +143,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 @@ -7562,9 +7562,9 @@ diff -Nur linux-3.15.4/arch/arm/Makefile linux-rpi/arch/arm/Makefile machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.15.4/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig ---- linux-3.15.4/arch/arm/mm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/mm/Kconfig 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mm/Kconfig linux-3.15.6/arch/arm/mm/Kconfig +--- linux-3.15.6.orig/arch/arm/mm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/mm/Kconfig 2014-07-25 15:20:16.552624878 +0200 @@ -358,7 +358,7 @@ # ARMv6 @@ -7574,9 +7574,9 @@ diff -Nur linux-3.15.4/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.15.4/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ---- linux-3.15.4/arch/arm/mm/proc-v6.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/mm/proc-v6.S 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mm/proc-v6.S linux-3.15.6/arch/arm/mm/proc-v6.S +--- linux-3.15.6.orig/arch/arm/mm/proc-v6.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/mm/proc-v6.S 2014-07-25 15:20:16.556624907 +0200 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -7600,9 +7600,9 @@ diff -Nur linux-3.15.4/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.15.4/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types ---- linux-3.15.4/arch/arm/tools/mach-types 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/tools/mach-types 2014-04-13 17:32:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/tools/mach-types linux-3.15.6/arch/arm/tools/mach-types +--- linux-3.15.6.orig/arch/arm/tools/mach-types 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/tools/mach-types 2014-07-25 15:20:16.556624907 +0200 @@ -522,6 +522,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -7611,9 +7611,9 @@ diff -Nur linux-3.15.4/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-t ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 -diff -Nur linux-3.15.4/arch/mips/include/asm/sigcontext.h linux-rpi/arch/mips/include/asm/sigcontext.h ---- linux-3.15.4/arch/mips/include/asm/sigcontext.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/include/asm/sigcontext.h 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/include/asm/sigcontext.h linux-3.15.6/arch/mips/include/asm/sigcontext.h +--- linux-3.15.6.orig/arch/mips/include/asm/sigcontext.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/include/asm/sigcontext.h 2014-07-25 15:20:16.556624907 +0200 @@ -32,6 +32,8 @@ __u32 sc_lo2; __u32 sc_hi3; @@ -7623,9 +7623,9 @@ diff -Nur linux-3.15.4/arch/mips/include/asm/sigcontext.h linux-rpi/arch/mips/in }; #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */ #endif /* _ASM_SIGCONTEXT_H */ -diff -Nur linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h linux-rpi/arch/mips/include/uapi/asm/sigcontext.h ---- linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/include/uapi/asm/sigcontext.h 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/include/uapi/asm/sigcontext.h linux-3.15.6/arch/mips/include/uapi/asm/sigcontext.h +--- linux-3.15.6.orig/arch/mips/include/uapi/asm/sigcontext.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/include/uapi/asm/sigcontext.h 2014-07-25 15:20:16.556624907 +0200 @@ -12,6 +12,10 @@ #include <linux/types.h> #include <asm/sgidefs.h> @@ -7655,9 +7655,9 @@ diff -Nur linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h linux-rpi/arch/mi }; -diff -Nur linux-3.15.4/arch/mips/kernel/asm-offsets.c linux-rpi/arch/mips/kernel/asm-offsets.c ---- linux-3.15.4/arch/mips/kernel/asm-offsets.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/asm-offsets.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/asm-offsets.c linux-3.15.6/arch/mips/kernel/asm-offsets.c +--- linux-3.15.6.orig/arch/mips/kernel/asm-offsets.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/asm-offsets.c 2014-07-25 15:20:16.968627845 +0200 @@ -295,6 +295,7 @@ OFFSET(SC_LO2, sigcontext, sc_lo2); OFFSET(SC_HI3, sigcontext, sc_hi3); @@ -7682,9 +7682,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/asm-offsets.c linux-rpi/arch/mips/kernel BLANK(); } #endif -diff -Nur linux-3.15.4/arch/mips/kernel/irq-msc01.c linux-rpi/arch/mips/kernel/irq-msc01.c ---- linux-3.15.4/arch/mips/kernel/irq-msc01.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/irq-msc01.c 2014-04-13 17:32:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/irq-msc01.c linux-3.15.6/arch/mips/kernel/irq-msc01.c +--- linux-3.15.6.orig/arch/mips/kernel/irq-msc01.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/irq-msc01.c 2014-07-25 15:20:17.368630696 +0200 @@ -131,7 +131,7 @@ board_bind_eic_interrupt = &msc_bind_eic_interrupt; @@ -7694,9 +7694,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/irq-msc01.c linux-rpi/arch/mips/kernel/i int n = imp->im_irq; switch (imp->im_type) { -diff -Nur linux-3.15.4/arch/mips/kernel/r4k_fpu.S linux-rpi/arch/mips/kernel/r4k_fpu.S ---- linux-3.15.4/arch/mips/kernel/r4k_fpu.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/r4k_fpu.S 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/r4k_fpu.S linux-3.15.6/arch/mips/kernel/r4k_fpu.S +--- linux-3.15.6.orig/arch/mips/kernel/r4k_fpu.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/r4k_fpu.S 2014-07-25 15:20:17.368630696 +0200 @@ -13,6 +13,7 @@ * Copyright (C) 1999, 2001 Silicon Graphics, Inc. */ @@ -7924,9 +7924,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/r4k_fpu.S linux-rpi/arch/mips/kernel/r4k .set reorder .type fault@function -diff -Nur linux-3.15.4/arch/mips/kernel/signal32.c linux-rpi/arch/mips/kernel/signal32.c ---- linux-3.15.4/arch/mips/kernel/signal32.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/signal32.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/signal32.c linux-3.15.6/arch/mips/kernel/signal32.c +--- linux-3.15.6.orig/arch/mips/kernel/signal32.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/signal32.c 2014-07-25 15:20:17.368630696 +0200 @@ -30,6 +30,7 @@ #include <asm/sim.h> #include <asm/ucontext.h> @@ -8084,9 +8084,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/signal32.c linux-rpi/arch/mips/kernel/si lose_fpu(0); } -diff -Nur linux-3.15.4/arch/mips/kernel/signal.c linux-rpi/arch/mips/kernel/signal.c ---- linux-3.15.4/arch/mips/kernel/signal.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/signal.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/signal.c linux-3.15.6/arch/mips/kernel/signal.c +--- linux-3.15.6.orig/arch/mips/kernel/signal.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/signal.c 2014-07-25 15:20:17.368630696 +0200 @@ -31,6 +31,7 @@ #include <linux/bitops.h> #include <asm/cacheflush.h> @@ -8268,9 +8268,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/signal.c linux-rpi/arch/mips/kernel/sign lose_fpu(0); } -diff -Nur linux-3.15.4/arch/mips/kvm/kvm_mips.c linux-rpi/arch/mips/kvm/kvm_mips.c ---- linux-3.15.4/arch/mips/kvm/kvm_mips.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kvm/kvm_mips.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kvm/kvm_mips.c linux-3.15.6/arch/mips/kvm/kvm_mips.c +--- linux-3.15.6.orig/arch/mips/kvm/kvm_mips.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kvm/kvm_mips.c 2014-07-25 15:20:17.368630696 +0200 @@ -149,7 +149,9 @@ if (kvm->arch.guest_pmap[i] != KVM_INVALID_PAGE) kvm_mips_release_pfn_clean(kvm->arch.guest_pmap[i]); @@ -8298,9 +8298,9 @@ diff -Nur linux-3.15.4/arch/mips/kvm/kvm_mips.c linux-rpi/arch/mips/kvm/kvm_mips } void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) -diff -Nur linux-3.15.4/arch/powerpc/include/asm/switch_to.h linux-rpi/arch/powerpc/include/asm/switch_to.h ---- linux-3.15.4/arch/powerpc/include/asm/switch_to.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/include/asm/switch_to.h 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/include/asm/switch_to.h linux-3.15.6/arch/powerpc/include/asm/switch_to.h +--- linux-3.15.6.orig/arch/powerpc/include/asm/switch_to.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/include/asm/switch_to.h 2014-07-25 15:20:17.368630696 +0200 @@ -84,8 +84,6 @@ { #ifdef CONFIG_PPC_BOOK3S_64 @@ -8310,9 +8310,9 @@ diff -Nur linux-3.15.4/arch/powerpc/include/asm/switch_to.h linux-rpi/arch/power t->thread.bescr = 0; t->thread.mmcr2 = 0; t->thread.mmcr0 = 0; -diff -Nur linux-3.15.4/arch/powerpc/include/asm/systbl.h linux-rpi/arch/powerpc/include/asm/systbl.h ---- linux-3.15.4/arch/powerpc/include/asm/systbl.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/include/asm/systbl.h 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/include/asm/systbl.h linux-3.15.6/arch/powerpc/include/asm/systbl.h +--- linux-3.15.6.orig/arch/powerpc/include/asm/systbl.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/include/asm/systbl.h 2014-07-25 15:20:17.368630696 +0200 @@ -190,7 +190,7 @@ SYSCALL_SPU(capget) SYSCALL_SPU(capset) @@ -8322,9 +8322,9 @@ diff -Nur linux-3.15.4/arch/powerpc/include/asm/systbl.h linux-rpi/arch/powerpc/ SYSCALL(ni_syscall) SYSCALL(ni_syscall) PPC_SYS(vfork) -diff -Nur linux-3.15.4/arch/powerpc/include/uapi/asm/cputable.h linux-rpi/arch/powerpc/include/uapi/asm/cputable.h ---- linux-3.15.4/arch/powerpc/include/uapi/asm/cputable.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/include/uapi/asm/cputable.h 2014-04-13 17:32:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/include/uapi/asm/cputable.h linux-3.15.6/arch/powerpc/include/uapi/asm/cputable.h +--- linux-3.15.6.orig/arch/powerpc/include/uapi/asm/cputable.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/include/uapi/asm/cputable.h 2014-07-25 15:20:17.372630725 +0200 @@ -41,6 +41,5 @@ #define PPC_FEATURE2_EBB 0x10000000 #define PPC_FEATURE2_ISEL 0x08000000 @@ -8332,9 +8332,9 @@ diff -Nur linux-3.15.4/arch/powerpc/include/uapi/asm/cputable.h linux-rpi/arch/p -#define PPC_FEATURE2_VEC_CRYPTO 0x02000000 #endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */ -diff -Nur linux-3.15.4/arch/powerpc/kernel/cputable.c linux-rpi/arch/powerpc/kernel/cputable.c ---- linux-3.15.4/arch/powerpc/kernel/cputable.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/kernel/cputable.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/kernel/cputable.c linux-3.15.6/arch/powerpc/kernel/cputable.c +--- linux-3.15.6.orig/arch/powerpc/kernel/cputable.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/kernel/cputable.c 2014-07-25 15:20:17.372630725 +0200 @@ -109,8 +109,7 @@ PPC_FEATURE_PSERIES_PERFMON_COMPAT) #define COMMON_USER2_POWER8 (PPC_FEATURE2_ARCH_2_07 | \ @@ -8345,9 +8345,9 @@ diff -Nur linux-3.15.4/arch/powerpc/kernel/cputable.c linux-rpi/arch/powerpc/ker #define COMMON_USER_PA6T (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\ PPC_FEATURE_TRUE_LE | \ PPC_FEATURE_HAS_ALTIVEC_COMP) -diff -Nur linux-3.15.4/arch/powerpc/kernel/legacy_serial.c linux-rpi/arch/powerpc/kernel/legacy_serial.c ---- linux-3.15.4/arch/powerpc/kernel/legacy_serial.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/kernel/legacy_serial.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/kernel/legacy_serial.c linux-3.15.6/arch/powerpc/kernel/legacy_serial.c +--- linux-3.15.6.orig/arch/powerpc/kernel/legacy_serial.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/kernel/legacy_serial.c 2014-07-25 15:20:17.372630725 +0200 @@ -48,9 +48,6 @@ static unsigned int legacy_serial_count; static int legacy_serial_console = -1; @@ -8399,9 +8399,9 @@ diff -Nur linux-3.15.4/arch/powerpc/kernel/legacy_serial.c linux-rpi/arch/powerp } #endif -diff -Nur linux-3.15.4/arch/powerpc/kernel/setup-common.c linux-rpi/arch/powerpc/kernel/setup-common.c ---- linux-3.15.4/arch/powerpc/kernel/setup-common.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/kernel/setup-common.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/kernel/setup-common.c linux-3.15.6/arch/powerpc/kernel/setup-common.c +--- linux-3.15.6.orig/arch/powerpc/kernel/setup-common.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/kernel/setup-common.c 2014-07-25 15:20:17.372630725 +0200 @@ -459,17 +459,9 @@ } @@ -8421,9 +8421,9 @@ diff -Nur linux-3.15.4/arch/powerpc/kernel/setup-common.c linux-rpi/arch/powerpc set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j])); set_cpu_possible(cpu, true); cpu++; -diff -Nur linux-3.15.4/arch/powerpc/kernel/time.c linux-rpi/arch/powerpc/kernel/time.c ---- linux-3.15.4/arch/powerpc/kernel/time.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/kernel/time.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/kernel/time.c linux-3.15.6/arch/powerpc/kernel/time.c +--- linux-3.15.6.orig/arch/powerpc/kernel/time.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/kernel/time.c 2014-07-25 15:20:17.372630725 +0200 @@ -551,7 +551,7 @@ may_hard_irq_enable(); @@ -8433,9 +8433,9 @@ diff -Nur linux-3.15.4/arch/powerpc/kernel/time.c linux-rpi/arch/powerpc/kernel/ if (atomic_read(&ppc_n_lost_interrupts) != 0) do_IRQ(regs); #endif -diff -Nur linux-3.15.4/arch/powerpc/lib/sstep.c linux-rpi/arch/powerpc/lib/sstep.c ---- linux-3.15.4/arch/powerpc/lib/sstep.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/lib/sstep.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/lib/sstep.c linux-3.15.6/arch/powerpc/lib/sstep.c +--- linux-3.15.6.orig/arch/powerpc/lib/sstep.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/lib/sstep.c 2014-07-25 15:20:17.372630725 +0200 @@ -1470,7 +1470,7 @@ regs->gpr[rd] = byterev_4(val); goto ldst_done; @@ -8445,9 +8445,9 @@ diff -Nur linux-3.15.4/arch/powerpc/lib/sstep.c linux-rpi/arch/powerpc/lib/sstep case 535: /* lfsx */ case 567: /* lfsux */ if (!(regs->msr & MSR_FP)) -diff -Nur linux-3.15.4/arch/powerpc/mm/hash_utils_64.c linux-rpi/arch/powerpc/mm/hash_utils_64.c ---- linux-3.15.4/arch/powerpc/mm/hash_utils_64.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/mm/hash_utils_64.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/mm/hash_utils_64.c linux-3.15.6/arch/powerpc/mm/hash_utils_64.c +--- linux-3.15.6.orig/arch/powerpc/mm/hash_utils_64.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/mm/hash_utils_64.c 2014-07-25 15:20:17.416631037 +0200 @@ -964,22 +964,6 @@ trap, vsid, ssize, psize, lpsize, pte); } @@ -8500,9 +8500,9 @@ diff -Nur linux-3.15.4/arch/powerpc/mm/hash_utils_64.c linux-rpi/arch/powerpc/mm #endif /* CONFIG_PPC_64K_PAGES */ #ifdef CONFIG_PPC_HAS_HASH_64K -diff -Nur linux-3.15.4/arch/powerpc/platforms/powernv/opal-sysparam.c linux-rpi/arch/powerpc/platforms/powernv/opal-sysparam.c ---- linux-3.15.4/arch/powerpc/platforms/powernv/opal-sysparam.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/platforms/powernv/opal-sysparam.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/platforms/powernv/opal-sysparam.c linux-3.15.6/arch/powerpc/platforms/powernv/opal-sysparam.c +--- linux-3.15.6.orig/arch/powerpc/platforms/powernv/opal-sysparam.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/platforms/powernv/opal-sysparam.c 2014-07-25 15:20:17.416631037 +0200 @@ -260,10 +260,10 @@ attr[i].kobj_attr.attr.mode = S_IRUGO; break; @@ -8516,9 +8516,9 @@ diff -Nur linux-3.15.4/arch/powerpc/platforms/powernv/opal-sysparam.c linux-rpi/ break; default: break; -diff -Nur linux-3.15.4/arch/powerpc/platforms/pseries/eeh_pseries.c linux-rpi/arch/powerpc/platforms/pseries/eeh_pseries.c ---- linux-3.15.4/arch/powerpc/platforms/pseries/eeh_pseries.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/powerpc/platforms/pseries/eeh_pseries.c 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/powerpc/platforms/pseries/eeh_pseries.c linux-3.15.6/arch/powerpc/platforms/pseries/eeh_pseries.c +--- linux-3.15.6.orig/arch/powerpc/platforms/pseries/eeh_pseries.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/powerpc/platforms/pseries/eeh_pseries.c 2014-07-25 15:20:17.416631037 +0200 @@ -464,7 +464,6 @@ } else { result = EEH_STATE_NOT_SUPPORT; @@ -8527,9 +8527,9 @@ diff -Nur linux-3.15.4/arch/powerpc/platforms/pseries/eeh_pseries.c linux-rpi/ar default: result = EEH_STATE_NOT_SUPPORT; } -diff -Nur linux-3.15.4/arch/x86/include/asm/ptrace.h linux-rpi/arch/x86/include/asm/ptrace.h ---- linux-3.15.4/arch/x86/include/asm/ptrace.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/x86/include/asm/ptrace.h 2014-07-07 10:44:59.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/x86/include/asm/ptrace.h linux-3.15.6/arch/x86/include/asm/ptrace.h +--- linux-3.15.6.orig/arch/x86/include/asm/ptrace.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/x86/include/asm/ptrace.h 2014-07-25 15:20:17.416631037 +0200 @@ -231,22 +231,6 @@ #define ARCH_HAS_USER_SINGLE_STEP_INFO @@ -8553,9 +8553,9 @@ diff -Nur linux-3.15.4/arch/x86/include/asm/ptrace.h linux-rpi/arch/x86/include/ struct user_desc; extern int do_get_thread_area(struct task_struct *p, int idx, struct user_desc __user *info); -diff -Nur linux-3.15.4/Documentation/sound/alsa/HD-Audio-Models.txt linux-rpi/Documentation/sound/alsa/HD-Audio-Models.txt ---- linux-3.15.4/Documentation/sound/alsa/HD-Audio-Models.txt 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/Documentation/sound/alsa/HD-Audio-Models.txt 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/Documentation/sound/alsa/HD-Audio-Models.txt linux-3.15.6/Documentation/sound/alsa/HD-Audio-Models.txt +--- linux-3.15.6.orig/Documentation/sound/alsa/HD-Audio-Models.txt 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/Documentation/sound/alsa/HD-Audio-Models.txt 2014-07-25 15:20:17.416631037 +0200 @@ -286,11 +286,6 @@ hp-inv-led HP with broken BIOS for inverted mute LED auto BIOS setup (default) @@ -8568,9 +8568,9 @@ diff -Nur linux-3.15.4/Documentation/sound/alsa/HD-Audio-Models.txt linux-rpi/Do STAC9872 ======== vaio VAIO laptop without SPDIF -diff -Nur linux-3.15.4/Documentation/SubmittingPatches linux-rpi/Documentation/SubmittingPatches ---- linux-3.15.4/Documentation/SubmittingPatches 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/Documentation/SubmittingPatches 2014-07-07 10:44:56.000000000 +0200 +diff -Nur linux-3.15.6.orig/Documentation/SubmittingPatches linux-3.15.6/Documentation/SubmittingPatches +--- linux-3.15.6.orig/Documentation/SubmittingPatches 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/Documentation/SubmittingPatches 2014-07-25 15:20:17.416631037 +0200 @@ -132,20 +132,6 @@ platform_set_drvdata(), but left the variable "dev" unused, delete it. @@ -8614,9 +8614,9 @@ diff -Nur linux-3.15.4/Documentation/SubmittingPatches linux-rpi/Documentation/S 15) The canonical patch format -diff -Nur linux-3.15.4/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-3.15.4/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2014-04-13 17:32:39.000000000 +0200 +diff -Nur linux-3.15.6.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.15.6/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-3.15.6.orig/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/Documentation/video4linux/bcm2835-v4l2.txt 2014-07-25 15:20:17.416631037 +0200 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -8678,9 +8678,9 @@ diff -Nur linux-3.15.4/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Docu +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-3.15.4/drivers/block/mtip32xx/mtip32xx.c linux-rpi/drivers/block/mtip32xx/mtip32xx.c ---- linux-3.15.4/drivers/block/mtip32xx/mtip32xx.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/block/mtip32xx/mtip32xx.c 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/block/mtip32xx/mtip32xx.c linux-3.15.6/drivers/block/mtip32xx/mtip32xx.c +--- linux-3.15.6.orig/drivers/block/mtip32xx/mtip32xx.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/block/mtip32xx/mtip32xx.c 2014-07-25 15:20:17.420631067 +0200 @@ -1529,37 +1529,6 @@ be16_to_cpus(&buf[i]); } @@ -8865,9 +8865,9 @@ diff -Nur linux-3.15.4/drivers/block/mtip32xx/mtip32xx.c linux-rpi/drivers/block } MODULE_AUTHOR("Micron Technology, Inc"); -diff -Nur linux-3.15.4/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig ---- linux-3.15.4/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Kconfig 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/broadcom/Kconfig linux-3.15.6/drivers/char/broadcom/Kconfig +--- linux-3.15.6.orig/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/char/broadcom/Kconfig 2014-07-25 15:20:17.420631067 +0200 @@ -0,0 +1,16 @@ +# +# Broadcom char driver config @@ -8885,14 +8885,14 @@ diff -Nur linux-3.15.4/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broa + help + Helper for videocore CMA access. + -diff -Nur linux-3.15.4/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile ---- linux-3.15.4/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Makefile 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/broadcom/Makefile linux-3.15.6/drivers/char/broadcom/Makefile +--- linux-3.15.6.orig/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/char/broadcom/Makefile 2014-07-25 15:20:17.492631581 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ -diff -Nur linux-3.15.4/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.15.4/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.15.6/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.15.6.orig/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/char/broadcom/vc_cma/Makefile 2014-07-25 15:20:17.492631581 +0200 @@ -0,0 +1,14 @@ +ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs +ccflags-y += -Werror @@ -8908,9 +8908,9 @@ diff -Nur linux-3.15.4/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/c +obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o + +vc-cma-objs := vc_cma.o -diff -Nur linux-3.15.4/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.15.4/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.15.6/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-3.15.6.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/char/broadcom/vc_cma/vc_cma.c 2014-07-25 15:20:17.496631610 +0200 @@ -0,0 +1,1143 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10055,9 +10055,9 @@ diff -Nur linux-3.15.4/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/c +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.15.4/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c ---- linux-3.15.4/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.15.6/drivers/char/hw_random/bcm2708-rng.c +--- linux-3.15.6.orig/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/char/hw_random/bcm2708-rng.c 2014-07-25 15:20:17.496631610 +0200 @@ -0,0 +1,118 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10177,9 +10177,9 @@ diff -Nur linux-3.15.4/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/ch + +MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver"); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-3.15.4/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig ---- linux-3.15.4/drivers/char/hw_random/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/char/hw_random/Kconfig 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/hw_random/Kconfig linux-3.15.6/drivers/char/hw_random/Kconfig +--- linux-3.15.6.orig/drivers/char/hw_random/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/char/hw_random/Kconfig 2014-07-25 15:20:17.496631610 +0200 @@ -341,6 +341,17 @@ If unsure, say Y. @@ -10198,18 +10198,18 @@ diff -Nur linux-3.15.4/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_ config HW_RANDOM_MSM tristate "Qualcomm SoCs Random Number Generator support" depends on HW_RANDOM && ARCH_QCOM -diff -Nur linux-3.15.4/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile ---- linux-3.15.4/drivers/char/hw_random/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/char/hw_random/Makefile 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/hw_random/Makefile linux-3.15.6/drivers/char/hw_random/Makefile +--- linux-3.15.6.orig/drivers/char/hw_random/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/char/hw_random/Makefile 2014-07-25 15:20:17.496631610 +0200 @@ -29,4 +29,5 @@ obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o -diff -Nur linux-3.15.4/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig ---- linux-3.15.4/drivers/char/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/char/Kconfig 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/Kconfig linux-3.15.6/drivers/char/Kconfig +--- linux-3.15.6.orig/drivers/char/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/char/Kconfig 2014-07-25 15:20:17.500631637 +0200 @@ -581,6 +581,8 @@ source "drivers/s390/char/Kconfig" @@ -10219,18 +10219,18 @@ diff -Nur linux-3.15.4/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Nur linux-3.15.4/drivers/char/Makefile linux-rpi/drivers/char/Makefile ---- linux-3.15.4/drivers/char/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/char/Makefile 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/char/Makefile linux-3.15.6/drivers/char/Makefile +--- linux-3.15.6.orig/drivers/char/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/char/Makefile 2014-07-25 15:20:17.500631637 +0200 @@ -61,3 +61,5 @@ js-rtc-y = rtc.o obj-$(CONFIG_TILE_SROM) += tile-srom.o + +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ -diff -Nur linux-3.15.4/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-3.15.4/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.15.6/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-3.15.6.orig/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/cpufreq/bcm2835-cpufreq.c 2014-07-25 15:20:17.500631637 +0200 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10471,9 +10471,9 @@ diff -Nur linux-3.15.4/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufr + +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); -diff -Nur linux-3.15.4/drivers/cpufreq/cpufreq.c linux-rpi/drivers/cpufreq/cpufreq.c ---- linux-3.15.4/drivers/cpufreq/cpufreq.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/cpufreq/cpufreq.c 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/cpufreq/cpufreq.c linux-3.15.6/drivers/cpufreq/cpufreq.c +--- linux-3.15.6.orig/drivers/cpufreq/cpufreq.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/cpufreq/cpufreq.c 2014-07-25 15:20:17.504631666 +0200 @@ -2166,8 +2166,10 @@ struct cpufreq_policy new_policy; int ret; @@ -10508,9 +10508,9 @@ diff -Nur linux-3.15.4/drivers/cpufreq/cpufreq.c linux-rpi/drivers/cpufreq/cpufr return ret; } EXPORT_SYMBOL(cpufreq_update_policy); -diff -Nur linux-3.15.4/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm ---- linux-3.15.4/drivers/cpufreq/Kconfig.arm 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/cpufreq/Kconfig.arm 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/cpufreq/Kconfig.arm linux-3.15.6/drivers/cpufreq/Kconfig.arm +--- linux-3.15.6.orig/drivers/cpufreq/Kconfig.arm 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/cpufreq/Kconfig.arm 2014-07-25 15:20:17.504631666 +0200 @@ -240,6 +240,14 @@ help This adds the CPUFreq driver support for SPEAr SOCs. @@ -10526,9 +10526,9 @@ diff -Nur linux-3.15.4/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kco config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA -diff -Nur linux-3.15.4/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile ---- linux-3.15.4/drivers/cpufreq/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/cpufreq/Makefile 2014-07-07 10:45:00.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/cpufreq/Makefile linux-3.15.6/drivers/cpufreq/Makefile +--- linux-3.15.6.orig/drivers/cpufreq/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/cpufreq/Makefile 2014-07-25 15:20:17.508631695 +0200 @@ -73,6 +73,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o @@ -10537,9 +10537,9 @@ diff -Nur linux-3.15.4/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefi obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o -diff -Nur linux-3.15.4/drivers/cpufreq/ppc-corenet-cpufreq.c linux-rpi/drivers/cpufreq/ppc-corenet-cpufreq.c ---- linux-3.15.4/drivers/cpufreq/ppc-corenet-cpufreq.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/cpufreq/ppc-corenet-cpufreq.c 2014-07-07 10:45:01.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/cpufreq/ppc-corenet-cpufreq.c linux-3.15.6/drivers/cpufreq/ppc-corenet-cpufreq.c +--- linux-3.15.6.orig/drivers/cpufreq/ppc-corenet-cpufreq.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/cpufreq/ppc-corenet-cpufreq.c 2014-07-25 15:20:17.512631723 +0200 @@ -138,7 +138,7 @@ struct cpufreq_frequency_table *table; struct cpu_data *data; @@ -10563,9 +10563,9 @@ diff -Nur linux-3.15.4/drivers/cpufreq/ppc-corenet-cpufreq.c linux-rpi/drivers/c of_node_put(np); -diff -Nur linux-3.15.4/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c ---- linux-3.15.4/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2014-07-07 10:45:01.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/dma/bcm2708-dmaengine.c linux-3.15.6/drivers/dma/bcm2708-dmaengine.c +--- linux-3.15.6.orig/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/dma/bcm2708-dmaengine.c 2014-07-25 15:20:17.512631723 +0200 @@ -0,0 +1,588 @@ +/* + * BCM2708 DMA engine support @@ -11155,9 +11155,9 @@ diff -Nur linux-3.15.4/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm +MODULE_DESCRIPTION("BCM2708 DMA engine driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig ---- linux-3.15.4/drivers/dma/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/dma/Kconfig 2014-07-07 10:45:01.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/dma/Kconfig linux-3.15.6/drivers/dma/Kconfig +--- linux-3.15.6.orig/drivers/dma/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/dma/Kconfig 2014-07-25 15:20:17.512631723 +0200 @@ -312,6 +312,12 @@ select DMA_ENGINE select DMA_VIRTUAL_CHANNELS @@ -11171,9 +11171,9 @@ diff -Nur linux-3.15.4/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig config TI_CPPI41 tristate "AM33xx CPPI41 DMA support" depends on ARCH_OMAP -diff -Nur linux-3.15.4/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile ---- linux-3.15.4/drivers/dma/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/dma/Makefile 2014-07-07 10:45:01.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/dma/Makefile linux-3.15.6/drivers/dma/Makefile +--- linux-3.15.6.orig/drivers/dma/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/dma/Makefile 2014-07-25 15:20:17.512631723 +0200 @@ -39,6 +39,7 @@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o @@ -11182,9 +11182,9 @@ diff -Nur linux-3.15.4/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_TI_CPPI41) += cppi41.o -diff -Nur linux-3.15.4/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c ---- linux-3.15.4/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2014-04-13 17:32:56.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.15.6/drivers/hwmon/bcm2835-hwmon.c +--- linux-3.15.6.orig/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/hwmon/bcm2835-hwmon.c 2014-07-25 15:20:17.516631752 +0200 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -11405,9 +11405,9 @@ diff -Nur linux-3.15.4/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); + +module_platform_driver(bcm2835_hwmon_driver); -diff -Nur linux-3.15.4/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig ---- linux-3.15.4/drivers/hwmon/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/hwmon/Kconfig 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/hwmon/Kconfig linux-3.15.6/drivers/hwmon/Kconfig +--- linux-3.15.6.orig/drivers/hwmon/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/hwmon/Kconfig 2014-07-25 15:20:17.516631752 +0200 @@ -1602,6 +1602,16 @@ This driver provides support for the Ultra45 workstation environmental sensors. @@ -11425,9 +11425,9 @@ diff -Nur linux-3.15.4/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig if ACPI comment "ACPI drivers" -diff -Nur linux-3.15.4/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile ---- linux-3.15.4/drivers/hwmon/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/hwmon/Makefile 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/hwmon/Makefile linux-3.15.6/drivers/hwmon/Makefile +--- linux-3.15.6.orig/drivers/hwmon/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/hwmon/Makefile 2014-07-25 15:20:17.516631752 +0200 @@ -146,6 +146,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -11436,9 +11436,9 @@ diff -Nur linux-3.15.4/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile obj-$(CONFIG_PMBUS) += pmbus/ -diff -Nur linux-3.15.4/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.15.4/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.15.6/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.15.6.orig/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/i2c/busses/i2c-bcm2708.c 2014-07-25 15:20:17.516631752 +0200 @@ -0,0 +1,448 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -11888,9 +11888,9 @@ diff -Nur linux-3.15.4/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/bu +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.15.4/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig ---- linux-3.15.4/drivers/i2c/busses/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/i2c/busses/Kconfig 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/i2c/busses/Kconfig linux-3.15.6/drivers/i2c/busses/Kconfig +--- linux-3.15.6.orig/drivers/i2c/busses/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/i2c/busses/Kconfig 2014-07-25 15:20:17.516631752 +0200 @@ -348,6 +348,25 @@ This support is also available as a module. If so, the module will be called i2c-bcm2835. @@ -11917,9 +11917,9 @@ diff -Nur linux-3.15.4/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/K config I2C_BCM_KONA tristate "BCM Kona I2C adapter" depends on ARCH_BCM_MOBILE -diff -Nur linux-3.15.4/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile ---- linux-3.15.4/drivers/i2c/busses/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/i2c/busses/Makefile 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/i2c/busses/Makefile linux-3.15.6/drivers/i2c/busses/Makefile +--- linux-3.15.6.orig/drivers/i2c/busses/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/i2c/busses/Makefile 2014-07-25 15:20:17.516631752 +0200 @@ -32,6 +32,7 @@ obj-$(CONFIG_I2C_AT91) += i2c-at91.o obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o @@ -11928,9 +11928,9 @@ diff -Nur linux-3.15.4/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/ obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CADENCE) += i2c-cadence.o obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o -diff -Nur linux-3.15.4/drivers/infiniband/core/user_mad.c linux-rpi/drivers/infiniband/core/user_mad.c ---- linux-3.15.4/drivers/infiniband/core/user_mad.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/core/user_mad.c 2014-04-13 17:32:56.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/core/user_mad.c linux-3.15.6/drivers/infiniband/core/user_mad.c +--- linux-3.15.6.orig/drivers/infiniband/core/user_mad.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/core/user_mad.c 2014-07-25 15:20:17.516631752 +0200 @@ -98,7 +98,7 @@ struct ib_umad_device { @@ -12131,9 +12131,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/core/user_mad.c linux-rpi/drivers/infi } static char *umad_devnode(struct device *dev, umode_t *mode) -diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/cq.c linux-rpi/drivers/infiniband/hw/cxgb4/cq.c ---- linux-3.15.4/drivers/infiniband/hw/cxgb4/cq.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/cxgb4/cq.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/cq.c linux-3.15.6/drivers/infiniband/hw/cxgb4/cq.c +--- linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/cq.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/cxgb4/cq.c 2014-07-25 15:20:17.516631752 +0200 @@ -940,6 +940,7 @@ if (!mm2) goto err4; @@ -12152,9 +12152,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/cq.c linux-rpi/drivers/infini if (ret) goto err5; -diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/device.c linux-rpi/drivers/infiniband/hw/cxgb4/device.c ---- linux-3.15.4/drivers/infiniband/hw/cxgb4/device.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/cxgb4/device.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/device.c linux-3.15.6/drivers/infiniband/hw/cxgb4/device.c +--- linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/device.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/cxgb4/device.c 2014-07-25 15:20:17.516631752 +0200 @@ -736,7 +736,6 @@ pci_resource_len(devp->rdev.lldi.pdev, 2)); if (!devp->rdev.bar2_kva) { @@ -12171,9 +12171,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/device.c linux-rpi/drivers/in return ERR_PTR(-EINVAL); } } -diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/provider.c linux-rpi/drivers/infiniband/hw/cxgb4/provider.c ---- linux-3.15.4/drivers/infiniband/hw/cxgb4/provider.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/cxgb4/provider.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/provider.c linux-3.15.6/drivers/infiniband/hw/cxgb4/provider.c +--- linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/provider.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/cxgb4/provider.c 2014-07-25 15:20:17.516631752 +0200 @@ -122,7 +122,7 @@ INIT_LIST_HEAD(&context->mmaps); spin_lock_init(&context->mmap_lock); @@ -12193,9 +12193,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/provider.c linux-rpi/drivers/ if (ret) goto err_mm; -diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/user.h linux-rpi/drivers/infiniband/hw/cxgb4/user.h ---- linux-3.15.4/drivers/infiniband/hw/cxgb4/user.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/cxgb4/user.h 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/user.h linux-3.15.6/drivers/infiniband/hw/cxgb4/user.h +--- linux-3.15.6.orig/drivers/infiniband/hw/cxgb4/user.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/cxgb4/user.h 2014-07-25 15:20:17.516631752 +0200 @@ -48,7 +48,6 @@ __u32 cqid; __u32 size; @@ -12211,9 +12211,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/cxgb4/user.h linux-rpi/drivers/infi - __u32 reserved; /* explicit padding (optional for i386) */ }; #endif -diff -Nur linux-3.15.4/drivers/infiniband/hw/ipath/ipath_diag.c linux-rpi/drivers/infiniband/hw/ipath/ipath_diag.c ---- linux-3.15.4/drivers/infiniband/hw/ipath/ipath_diag.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/ipath/ipath_diag.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/ipath/ipath_diag.c linux-3.15.6/drivers/infiniband/hw/ipath/ipath_diag.c +--- linux-3.15.6.orig/drivers/infiniband/hw/ipath/ipath_diag.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/ipath/ipath_diag.c 2014-07-25 15:20:17.516631752 +0200 @@ -346,10 +346,6 @@ ret = -EFAULT; goto bail; @@ -12225,9 +12225,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/ipath/ipath_diag.c linux-rpi/driver } else { ret = -EINVAL; goto bail; -diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/cq.c linux-rpi/drivers/infiniband/hw/mlx5/cq.c ---- linux-3.15.4/drivers/infiniband/hw/mlx5/cq.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/mlx5/cq.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/mlx5/cq.c linux-3.15.6/drivers/infiniband/hw/mlx5/cq.c +--- linux-3.15.6.orig/drivers/infiniband/hw/mlx5/cq.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/mlx5/cq.c 2014-07-25 15:20:17.516631752 +0200 @@ -32,7 +32,6 @@ #include <linux/kref.h> @@ -12262,9 +12262,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/cq.c linux-rpi/drivers/infinib if (ucmd.cqe_size != 64 && ucmd.cqe_size != 128) return -EINVAL; -diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/srq.c linux-rpi/drivers/infiniband/hw/mlx5/srq.c ---- linux-3.15.4/drivers/infiniband/hw/mlx5/srq.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/mlx5/srq.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/mlx5/srq.c linux-3.15.6/drivers/infiniband/hw/mlx5/srq.c +--- linux-3.15.6.orig/drivers/infiniband/hw/mlx5/srq.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/mlx5/srq.c 2014-07-25 15:20:17.520631781 +0200 @@ -35,7 +35,6 @@ #include <linux/mlx5/srq.h> #include <linux/slab.h> @@ -12302,9 +12302,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/srq.c linux-rpi/drivers/infini srq->wq_sig = !!(ucmd.flags & MLX5_SRQ_FLAG_SIGNATURE); srq->umem = ib_umem_get(pd->uobject->context, ucmd.buf_addr, buf_size, -diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/user.h linux-rpi/drivers/infiniband/hw/mlx5/user.h ---- linux-3.15.4/drivers/infiniband/hw/mlx5/user.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/mlx5/user.h 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/mlx5/user.h linux-3.15.6/drivers/infiniband/hw/mlx5/user.h +--- linux-3.15.6.orig/drivers/infiniband/hw/mlx5/user.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/mlx5/user.h 2014-07-25 15:20:17.520631781 +0200 @@ -91,7 +91,6 @@ __u64 buf_addr; __u64 db_addr; @@ -12321,9 +12321,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/mlx5/user.h linux-rpi/drivers/infin }; struct mlx5_ib_create_srq_resp { -diff -Nur linux-3.15.4/drivers/infiniband/hw/qib/qib_mad.c linux-rpi/drivers/infiniband/hw/qib/qib_mad.c ---- linux-3.15.4/drivers/infiniband/hw/qib/qib_mad.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/hw/qib/qib_mad.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/hw/qib/qib_mad.c linux-3.15.6/drivers/infiniband/hw/qib/qib_mad.c +--- linux-3.15.6.orig/drivers/infiniband/hw/qib/qib_mad.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/hw/qib/qib_mad.c 2014-07-25 15:20:17.520631781 +0200 @@ -1028,7 +1028,7 @@ event.event = IB_EVENT_PKEY_CHANGE; @@ -12333,9 +12333,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/hw/qib/qib_mad.c linux-rpi/drivers/inf ib_dispatch_event(&event); } return 0; -diff -Nur linux-3.15.4/drivers/infiniband/ulp/srp/ib_srp.c linux-rpi/drivers/infiniband/ulp/srp/ib_srp.c ---- linux-3.15.4/drivers/infiniband/ulp/srp/ib_srp.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/infiniband/ulp/srp/ib_srp.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/infiniband/ulp/srp/ib_srp.c linux-3.15.6/drivers/infiniband/ulp/srp/ib_srp.c +--- linux-3.15.6.orig/drivers/infiniband/ulp/srp/ib_srp.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/infiniband/ulp/srp/ib_srp.c 2014-07-25 15:20:17.520631781 +0200 @@ -1594,12 +1594,6 @@ err_iu: srp_put_tx_iu(target, iu, SRP_IU_CMD); @@ -12349,9 +12349,9 @@ diff -Nur linux-3.15.4/drivers/infiniband/ulp/srp/ib_srp.c linux-rpi/drivers/inf spin_lock_irqsave(&target->lock, flags); list_add(&req->list, &target->free_reqs); -diff -Nur linux-3.15.4/drivers/input/mouse/elantech.c linux-rpi/drivers/input/mouse/elantech.c ---- linux-3.15.4/drivers/input/mouse/elantech.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/input/mouse/elantech.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/input/mouse/elantech.c linux-3.15.6/drivers/input/mouse/elantech.c +--- linux-3.15.6.orig/drivers/input/mouse/elantech.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/input/mouse/elantech.c 2014-07-25 15:20:17.520631781 +0200 @@ -473,15 +473,8 @@ input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2); @@ -12409,9 +12409,9 @@ diff -Nur linux-3.15.4/drivers/input/mouse/elantech.c linux-rpi/drivers/input/mo */ static const struct dmi_system_id no_hw_res_dmi_table[] = { #if defined(CONFIG_DMI) && defined(CONFIG_X86) -diff -Nur linux-3.15.4/drivers/input/mouse/synaptics.c linux-rpi/drivers/input/mouse/synaptics.c ---- linux-3.15.4/drivers/input/mouse/synaptics.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/input/mouse/synaptics.c 2014-07-07 10:45:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/input/mouse/synaptics.c linux-3.15.6/drivers/input/mouse/synaptics.c +--- linux-3.15.6.orig/drivers/input/mouse/synaptics.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/input/mouse/synaptics.c 2014-07-25 15:20:17.520631781 +0200 @@ -347,6 +347,15 @@ unsigned char resp[3]; int i; @@ -12445,9 +12445,9 @@ diff -Nur linux-3.15.4/drivers/input/mouse/synaptics.c linux-rpi/drivers/input/m if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 && SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) { if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) { -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c ---- linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-3.15.6/drivers/media/platform/bcm2835/bcm2835-camera.c +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,1827 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -14276,9 +14276,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h ---- linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-3.15.6/drivers/media/platform/bcm2835/bcm2835-camera.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,126 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -14406,9 +14406,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi + (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \ + (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \ +} -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c ---- linux-3.15.4/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/controls.c linux-3.15.6/drivers/media/platform/bcm2835/controls.c +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/controls.c 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,1322 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -15732,9 +15732,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/controls.c linux-rpi/drive + + return 0; +} -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig ---- linux-3.15.4/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/Kconfig linux-3.15.6/drivers/media/platform/bcm2835/Kconfig +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/Kconfig 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,25 @@ +# Broadcom VideoCore IV v4l2 camera support + @@ -15761,18 +15761,18 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/ + + +endif # VIDEO_BM2835 -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile ---- linux-3.15.4/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/Makefile linux-3.15.6/drivers/media/platform/bcm2835/Makefile +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/Makefile 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,5 @@ +bcm2835-v4l2-objs := bcm2835-camera.o controls.o mmal-vchiq.o + +obj-$(CONFIG_VIDEO_BCM2835_MMAL) += bcm2835-v4l2.o + +ccflags-$(CONFIG_VIDEO_BCM2835) += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-common.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-common.h 2014-07-25 15:20:17.524631808 +0200 @@ -0,0 +1,53 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -15827,9 +15827,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/dr + u32 v; +}; + -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-encodings.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-encodings.h 2014-07-25 15:20:17.528631837 +0200 @@ -0,0 +1,127 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -15958,9 +15958,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi +/* @} MmalColorSpace List */ + +#endif /* MMAL_ENCODINGS_H */ -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-common.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-07-25 15:20:18.212636715 +0200 @@ -0,0 +1,50 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -16012,9 +16012,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rp +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-format.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-07-25 15:20:18.212636715 +0200 @@ -0,0 +1,81 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -16097,9 +16097,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rp +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg.h 2014-07-25 15:20:18.212636715 +0200 @@ -0,0 +1,404 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -16505,9 +16505,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drive + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-port.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-07-25 15:20:18.212636715 +0200 @@ -0,0 +1,107 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -16616,9 +16616,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/ + */ + +}; -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-parameters.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-parameters.h 2014-07-25 15:20:18.212636715 +0200 @@ -0,0 +1,656 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -17276,9 +17276,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-parameters.h linux-rp + u32 num_effect_params; + u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS]; +}; -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3.15.6/drivers/media/platform/bcm2835/mmal-vchiq.c +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-07-25 15:20:18.216636742 +0200 @@ -0,0 +1,1916 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -19196,9 +19196,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/dri + kfree(instance); + return -ENODEV; +} -diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h ---- linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3.15.6/drivers/media/platform/bcm2835/mmal-vchiq.h +--- linux-3.15.6.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-07-25 15:20:18.216636742 +0200 @@ -0,0 +1,178 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -19378,9 +19378,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/dri + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ -diff -Nur linux-3.15.4/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig ---- linux-3.15.4/drivers/media/platform/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/media/platform/Kconfig 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/Kconfig linux-3.15.6/drivers/media/platform/Kconfig +--- linux-3.15.6.orig/drivers/media/platform/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/media/platform/Kconfig 2014-07-25 15:20:18.216636742 +0200 @@ -118,6 +118,7 @@ source "drivers/media/platform/soc_camera/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" @@ -19389,9 +19389,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/Kconfig linux-rpi/drivers/media/pl endif # V4L_PLATFORM_DRIVERS -diff -Nur linux-3.15.4/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile ---- linux-3.15.4/drivers/media/platform/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/media/platform/Makefile 2014-07-07 10:45:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/platform/Makefile linux-3.15.6/drivers/media/platform/Makefile +--- linux-3.15.6.orig/drivers/media/platform/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/media/platform/Makefile 2014-07-25 15:20:18.216636742 +0200 @@ -51,4 +51,6 @@ obj-$(CONFIG_ARCH_OMAP) += omap/ @@ -19399,9 +19399,9 @@ diff -Nur linux-3.15.4/drivers/media/platform/Makefile linux-rpi/drivers/media/p +obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/ + ccflags-y += -I$(srctree)/drivers/media/i2c -diff -Nur linux-3.15.4/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c ---- linux-3.15.4/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.15.6/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +--- linux-3.15.6.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-07-25 15:20:18.216636742 +0200 @@ -1531,6 +1531,10 @@ &rtl2832u_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, @@ -19413,9 +19413,9 @@ diff -Nur linux-3.15.4/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03, &rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, -diff -Nur linux-3.15.4/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig ---- linux-3.15.4/drivers/misc/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/misc/Kconfig 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/Kconfig linux-3.15.6/drivers/misc/Kconfig +--- linux-3.15.6.orig/drivers/misc/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/misc/Kconfig 2014-07-25 15:20:18.220636771 +0200 @@ -524,6 +524,7 @@ source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/mei/Kconfig" @@ -19424,9 +19424,9 @@ diff -Nur linux-3.15.4/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig source "drivers/misc/mic/Kconfig" source "drivers/misc/genwqe/Kconfig" source "drivers/misc/echo/Kconfig" -diff -Nur linux-3.15.4/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile ---- linux-3.15.4/drivers/misc/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/misc/Makefile 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/Makefile linux-3.15.6/drivers/misc/Makefile +--- linux-3.15.6.orig/drivers/misc/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/misc/Makefile 2014-07-25 15:20:18.220636771 +0200 @@ -52,6 +52,7 @@ obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o @@ -19435,9 +19435,9 @@ diff -Nur linux-3.15.4/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile obj-y += mic/ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-07-25 15:20:18.220636771 +0200 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -19767,9 +19767,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -19975,9 +19975,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20203,9 +20203,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20278,9 +20278,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20445,9 +20445,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,373 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20822,9 +20822,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20868,9 +20868,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,562 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21434,9 +21434,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-07-25 15:20:18.224636800 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21480,9 +21480,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-07-25 15:20:18.228636828 +0200 @@ -0,0 +1,2814 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24298,9 +24298,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-07-25 15:20:18.228636828 +0200 @@ -0,0 +1,212 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24514,9 +24514,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-07-25 15:20:18.228636828 +0200 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24555,9 +24555,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_buil +const char *vchiq_get_build_version(void); +const char *vchiq_get_build_time(void); +const char *vchiq_get_build_date(void); -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-07-25 15:20:18.228636828 +0200 @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24619,9 +24619,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-07-25 15:20:18.480638626 +0200 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24743,9 +24743,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + mutex_unlock(&g_connected_mutex); +} +EXPORT_SYMBOL(vchiq_add_connected_callback); -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-07-25 15:20:18.540639053 +0200 @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24797,9 +24797,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn +void vchiq_call_connected_callbacks(void); + +#endif /* VCHIQ_CONNECTED_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,3825 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -28626,9 +28626,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,706 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29336,9 +29336,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -29427,9 +29427,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv + return vchiq_build_time; +} +EOF -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29471,9 +29471,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li +#include "vchiq_util.h" + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,188 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29663,9 +29663,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h + short *peer_version); + +#endif /* VCHIQ_IF_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-07-25 15:20:18.544639081 +0200 @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29796,9 +29796,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-07-25 15:20:18.548639110 +0200 @@ -0,0 +1,457 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -30257,9 +30257,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2014-07-25 15:20:18.548639110 +0200 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -30330,9 +30330,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kill +#define mutex_lock_interruptible mutex_lock_interruptible_killable + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-07-25 15:20:18.548639110 +0200 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -30405,9 +30405,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-07-25 15:20:18.548639110 +0200 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -30467,9 +30467,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-07-25 15:20:18.548639110 +0200 @@ -0,0 +1,253 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -30724,9 +30724,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc +} + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-07-25 15:20:18.560639195 +0200 @@ -0,0 +1,828 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -31556,9 +31556,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-07-25 15:20:18.560639195 +0200 @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -31712,9 +31712,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-07-25 15:20:18.560639195 +0200 @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -31797,9 +31797,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util +extern VCHIQ_HEADER_T *vchiu_queue_pop(VCHIU_QUEUE_T *queue); + +#endif -diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c ---- linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-04-13 17:32:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-3.15.6.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-07-25 15:20:18.560639195 +0200 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -31860,9 +31860,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Nur linux-3.15.4/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig ---- linux-3.15.4/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Kconfig 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/Kconfig linux-3.15.6/drivers/misc/vc04_services/Kconfig +--- linux-3.15.6.orig/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/Kconfig 2014-07-25 15:20:18.564639224 +0200 @@ -0,0 +1,9 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -31873,9 +31873,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc + BCM2708 family of products. + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. -diff -Nur linux-3.15.4/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile ---- linux-3.15.4/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Makefile 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/misc/vc04_services/Makefile linux-3.15.6/drivers/misc/vc04_services/Makefile +--- linux-3.15.6.orig/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/misc/vc04_services/Makefile 2014-07-25 15:20:18.564639224 +0200 @@ -0,0 +1,17 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -31894,9 +31894,9 @@ diff -Nur linux-3.15.4/drivers/misc/vc04_services/Makefile linux-rpi/drivers/mis +ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 + +endif -diff -Nur linux-3.15.4/drivers/mmc/card/block.c linux-rpi/drivers/mmc/card/block.c ---- linux-3.15.4/drivers/mmc/card/block.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/card/block.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/card/block.c linux-3.15.6/drivers/mmc/card/block.c +--- linux-3.15.6.orig/drivers/mmc/card/block.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/card/block.c 2014-07-25 15:20:18.564639224 +0200 @@ -1404,7 +1404,7 @@ brq->data.blocks = 1; } @@ -31906,9 +31906,9 @@ diff -Nur linux-3.15.4/drivers/mmc/card/block.c linux-rpi/drivers/mmc/card/block /* SPI multiblock writes terminate using a special * token, not a STOP_TRANSMISSION request. */ -diff -Nur linux-3.15.4/drivers/mmc/core/sd.c linux-rpi/drivers/mmc/core/sd.c ---- linux-3.15.4/drivers/mmc/core/sd.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/core/sd.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/core/sd.c linux-3.15.6/drivers/mmc/core/sd.c +--- linux-3.15.6.orig/drivers/mmc/core/sd.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/core/sd.c 2014-07-25 15:20:18.568639253 +0200 @@ -15,6 +15,8 @@ #include <linux/slab.h> #include <linux/stat.h> @@ -32063,9 +32063,9 @@ diff -Nur linux-3.15.4/drivers/mmc/core/sd.c linux-rpi/drivers/mmc/core/sd.c return err; /* -diff -Nur linux-3.15.4/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig ---- linux-3.15.4/drivers/mmc/host/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/host/Kconfig 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/host/Kconfig linux-3.15.6/drivers/mmc/host/Kconfig +--- linux-3.15.6.orig/drivers/mmc/host/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/host/Kconfig 2014-07-25 15:20:18.568639253 +0200 @@ -272,6 +272,27 @@ If you have a controller with this interface, say Y or M here. @@ -32094,9 +32094,9 @@ diff -Nur linux-3.15.4/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconf config MMC_SDHCI_BCM2835 tristate "SDHCI platform support for the BCM2835 SD/MMC Controller" depends on ARCH_BCM2835 -diff -Nur linux-3.15.4/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile ---- linux-3.15.4/drivers/mmc/host/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/host/Makefile 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/host/Makefile linux-3.15.6/drivers/mmc/host/Makefile +--- linux-3.15.6.orig/drivers/mmc/host/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/host/Makefile 2014-07-25 15:20:18.568639253 +0200 @@ -16,6 +16,7 @@ obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o @@ -32105,9 +32105,9 @@ diff -Nur linux-3.15.4/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Make obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o -diff -Nur linux-3.15.4/drivers/mmc/host/sdhci-bcm2708.c linux-rpi/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.15.4/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/sdhci-bcm2708.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/host/sdhci-bcm2708.c linux-3.15.6/drivers/mmc/host/sdhci-bcm2708.c +--- linux-3.15.6.orig/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/mmc/host/sdhci-bcm2708.c 2014-07-25 15:20:18.568639253 +0200 @@ -0,0 +1,1410 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -33519,9 +33519,9 @@ diff -Nur linux-3.15.4/drivers/mmc/host/sdhci-bcm2708.c linux-rpi/drivers/mmc/ho +MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages"); + + -diff -Nur linux-3.15.4/drivers/mmc/host/sdhci.c linux-rpi/drivers/mmc/host/sdhci.c ---- linux-3.15.4/drivers/mmc/host/sdhci.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/host/sdhci.c 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/host/sdhci.c linux-3.15.6/drivers/mmc/host/sdhci.c +--- linux-3.15.6.orig/drivers/mmc/host/sdhci.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/host/sdhci.c 2014-07-25 15:20:18.572639280 +0200 @@ -28,6 +28,7 @@ #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> @@ -34366,9 +34366,9 @@ diff -Nur linux-3.15.4/drivers/mmc/host/sdhci.c linux-rpi/drivers/mmc/host/sdhci } sdhci_disable_card_detection(host); -diff -Nur linux-3.15.4/drivers/mmc/host/sdhci.h linux-rpi/drivers/mmc/host/sdhci.h ---- linux-3.15.4/drivers/mmc/host/sdhci.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/mmc/host/sdhci.h 2014-07-07 10:45:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/mmc/host/sdhci.h linux-3.15.6/drivers/mmc/host/sdhci.h +--- linux-3.15.6.orig/drivers/mmc/host/sdhci.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/mmc/host/sdhci.h 2014-07-25 15:20:18.572639280 +0200 @@ -290,6 +290,18 @@ void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); int (*platform_execute_tuning)(struct sdhci_host *host, u32 opcode); @@ -34427,9 +34427,9 @@ diff -Nur linux-3.15.4/drivers/mmc/host/sdhci.h linux-rpi/drivers/mmc/host/sdhci + + #endif /* __SDHCI_HW_H */ -diff -Nur linux-3.15.4/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c ---- linux-3.15.4/drivers/net/usb/smsc95xx.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/net/usb/smsc95xx.c 2014-07-07 10:45:25.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/net/usb/smsc95xx.c linux-3.15.6/drivers/net/usb/smsc95xx.c +--- linux-3.15.6.orig/drivers/net/usb/smsc95xx.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/net/usb/smsc95xx.c 2014-07-25 15:20:18.572639280 +0200 @@ -59,6 +59,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -34509,10 +34509,10 @@ diff -Nur linux-3.15.4/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc /* try reading mac address from EEPROM */ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { -diff -Nur linux-3.15.4/drivers/pci/pci.c linux-rpi/drivers/pci/pci.c ---- linux-3.15.4/drivers/pci/pci.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/pci/pci.c 2014-07-07 10:45:26.000000000 +0200 -@@ -4126,7 +4126,7 @@ +diff -Nur linux-3.15.6.orig/drivers/pci/pci.c linux-3.15.6/drivers/pci/pci.c +--- linux-3.15.6.orig/drivers/pci/pci.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/pci/pci.c 2014-07-25 15:20:18.576639309 +0200 +@@ -4131,7 +4131,7 @@ u16 cmd; int rc; @@ -34521,9 +34521,9 @@ diff -Nur linux-3.15.4/drivers/pci/pci.c linux-rpi/drivers/pci/pci.c /* ARCH specific VGA enables */ rc = pci_set_vga_state_arch(dev, decode, command_bits, flags); -diff -Nur linux-3.15.4/drivers/pci/quirks.c linux-rpi/drivers/pci/quirks.c ---- linux-3.15.4/drivers/pci/quirks.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/pci/quirks.c 2014-07-07 10:45:26.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/pci/quirks.c linux-3.15.6/drivers/pci/quirks.c +--- linux-3.15.6.orig/drivers/pci/quirks.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/pci/quirks.c 2014-07-25 15:20:18.576639309 +0200 @@ -2954,7 +2954,6 @@ } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); @@ -34532,9 +34532,9 @@ diff -Nur linux-3.15.4/drivers/pci/quirks.c linux-rpi/drivers/pci/quirks.c /* * PCI devices which are on Intel chips can skip the 10ms delay -diff -Nur linux-3.15.4/drivers/scsi/hpsa.c linux-rpi/drivers/scsi/hpsa.c ---- linux-3.15.4/drivers/scsi/hpsa.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/scsi/hpsa.c 2014-07-07 10:45:27.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/scsi/hpsa.c linux-3.15.6/drivers/scsi/hpsa.c +--- linux-3.15.6.orig/drivers/scsi/hpsa.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/scsi/hpsa.c 2014-07-25 15:20:18.576639309 +0200 @@ -115,15 +115,9 @@ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C3}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C4}, @@ -34567,9 +34567,9 @@ diff -Nur linux-3.15.4/drivers/scsi/hpsa.c linux-rpi/drivers/scsi/hpsa.c {0x00761590, "HP Storage P1224 Array Controller", &SA5_access}, {0x00871590, "HP Storage P1224e Array Controller", &SA5_access}, {0x007D1590, "HP Storage P1228 Array Controller", &SA5_access}, -diff -Nur linux-3.15.4/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig ---- linux-3.15.4/drivers/spi/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/spi/Kconfig 2014-07-07 10:45:28.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/spi/Kconfig linux-3.15.6/drivers/spi/Kconfig +--- linux-3.15.6.orig/drivers/spi/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/spi/Kconfig 2014-07-25 15:20:18.576639309 +0200 @@ -85,6 +85,14 @@ is for the regular SPI controller. Slave mode operation is not also not supported. @@ -34585,9 +34585,9 @@ diff -Nur linux-3.15.4/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN && !BF60x -diff -Nur linux-3.15.4/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile ---- linux-3.15.4/drivers/spi/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/spi/Makefile 2014-07-07 10:45:28.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/spi/Makefile linux-3.15.6/drivers/spi/Makefile +--- linux-3.15.6.orig/drivers/spi/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/spi/Makefile 2014-07-25 15:20:18.576639309 +0200 @@ -19,6 +19,7 @@ obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o @@ -34596,9 +34596,9 @@ diff -Nur linux-3.15.4/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o -diff -Nur linux-3.15.4/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c ---- linux-3.15.4/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/spi/spi-bcm2708.c 2014-07-07 10:45:28.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/spi/spi-bcm2708.c linux-3.15.6/drivers/spi/spi-bcm2708.c +--- linux-3.15.6.orig/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/spi/spi-bcm2708.c 2014-07-25 15:20:18.580639338 +0200 @@ -0,0 +1,626 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -35226,9 +35226,9 @@ diff -Nur linux-3.15.4/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm27 +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.15.4/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig ---- linux-3.15.4/drivers/staging/media/lirc/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/staging/media/lirc/Kconfig 2014-04-13 17:33:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/staging/media/lirc/Kconfig linux-3.15.6/drivers/staging/media/lirc/Kconfig +--- linux-3.15.6.orig/drivers/staging/media/lirc/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/staging/media/lirc/Kconfig 2014-07-25 15:20:18.580639338 +0200 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -35242,9 +35242,9 @@ diff -Nur linux-3.15.4/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/stag config LIRC_SASEM tristate "Sasem USB IR Remote" depends on LIRC && USB -diff -Nur linux-3.15.4/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c ---- linux-3.15.4/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2014-06-29 11:34:17.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.15.6/drivers/staging/media/lirc/lirc_rpi.c +--- linux-3.15.6.orig/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/staging/media/lirc/lirc_rpi.c 2014-07-25 15:20:18.580639338 +0200 @@ -0,0 +1,695 @@ +/* + * lirc_rpi.c @@ -35941,9 +35941,9 @@ diff -Nur linux-3.15.4/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Nur linux-3.15.4/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile ---- linux-3.15.4/drivers/staging/media/lirc/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/staging/media/lirc/Makefile 2014-04-13 17:33:09.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/staging/media/lirc/Makefile linux-3.15.6/drivers/staging/media/lirc/Makefile +--- linux-3.15.6.orig/drivers/staging/media/lirc/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/staging/media/lirc/Makefile 2014-07-25 15:20:18.580639338 +0200 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -35952,9 +35952,9 @@ diff -Nur linux-3.15.4/drivers/staging/media/lirc/Makefile linux-rpi/drivers/sta obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o obj-$(CONFIG_LIRC_SIR) += lirc_sir.o -diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target.c linux-rpi/drivers/target/iscsi/iscsi_target.c ---- linux-3.15.4/drivers/target/iscsi/iscsi_target.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/target/iscsi/iscsi_target.c 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/target/iscsi/iscsi_target.c linux-3.15.6/drivers/target/iscsi/iscsi_target.c +--- linux-3.15.6.orig/drivers/target/iscsi/iscsi_target.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/target/iscsi/iscsi_target.c 2014-07-25 15:20:18.584639366 +0200 @@ -1309,7 +1309,7 @@ if (cmd->data_direction != DMA_TO_DEVICE) { pr_err("Command ITT: 0x%08x received DataOUT for a" @@ -35964,9 +35964,9 @@ diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target.c linux-rpi/drivers/tar } se_cmd = &cmd->se_cmd; iscsit_mod_dataout_timer(cmd); -diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target_login.c linux-rpi/drivers/target/iscsi/iscsi_target_login.c ---- linux-3.15.4/drivers/target/iscsi/iscsi_target_login.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/target/iscsi/iscsi_target_login.c 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/target/iscsi/iscsi_target_login.c linux-3.15.6/drivers/target/iscsi/iscsi_target_login.c +--- linux-3.15.6.orig/drivers/target/iscsi/iscsi_target_login.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/target/iscsi/iscsi_target_login.c 2014-07-25 15:20:18.584639366 +0200 @@ -1216,7 +1216,7 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) { @@ -36008,9 +36008,9 @@ diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target_login.c linux-rpi/drive ret = __iscsi_target_login_thread(np); /* * We break and exit here unless another sock_accept() call -diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target_util.c linux-rpi/drivers/target/iscsi/iscsi_target_util.c ---- linux-3.15.4/drivers/target/iscsi/iscsi_target_util.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/target/iscsi/iscsi_target_util.c 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/target/iscsi/iscsi_target_util.c linux-3.15.6/drivers/target/iscsi/iscsi_target_util.c +--- linux-3.15.6.orig/drivers/target/iscsi/iscsi_target_util.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/target/iscsi/iscsi_target_util.c 2014-07-25 15:20:18.584639366 +0200 @@ -1295,8 +1295,6 @@ login->login_failed = 1; iscsit_collect_login_stats(conn, status_class, status_detail); @@ -36020,9 +36020,9 @@ diff -Nur linux-3.15.4/drivers/target/iscsi/iscsi_target_util.c linux-rpi/driver hdr = (struct iscsi_login_rsp *)&login->rsp[0]; hdr->opcode = ISCSI_OP_LOGIN_RSP; hdr->status_class = status_class; -diff -Nur linux-3.15.4/drivers/target/target_core_device.c linux-rpi/drivers/target/target_core_device.c ---- linux-3.15.4/drivers/target/target_core_device.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/target/target_core_device.c 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/target/target_core_device.c linux-3.15.6/drivers/target/target_core_device.c +--- linux-3.15.6.orig/drivers/target/target_core_device.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/target/target_core_device.c 2014-07-25 15:20:18.588639395 +0200 @@ -616,7 +616,6 @@ dev->export_count--; spin_unlock(&hba->device_lock); @@ -36031,9 +36031,9 @@ diff -Nur linux-3.15.4/drivers/target/target_core_device.c linux-rpi/drivers/tar lun->lun_se_dev = NULL; } -diff -Nur linux-3.15.4/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c ---- linux-3.15.4/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2014-04-13 17:33:10.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/thermal/bcm2835-thermal.c linux-3.15.6/drivers/thermal/bcm2835-thermal.c +--- linux-3.15.6.orig/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/thermal/bcm2835-thermal.c 2014-07-25 15:20:18.588639395 +0200 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -36219,9 +36219,9 @@ diff -Nur linux-3.15.4/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/therm +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); + +module_platform_driver(bcm2835_thermal_driver); -diff -Nur linux-3.15.4/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig ---- linux-3.15.4/drivers/thermal/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/thermal/Kconfig 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/thermal/Kconfig linux-3.15.6/drivers/thermal/Kconfig +--- linux-3.15.6.orig/drivers/thermal/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/thermal/Kconfig 2014-07-25 15:20:18.588639395 +0200 @@ -196,6 +196,12 @@ enforce idle time which results in more package C-state residency. The user interface is exposed via generic thermal framework. @@ -36235,9 +36235,9 @@ diff -Nur linux-3.15.4/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig config X86_PKG_TEMP_THERMAL tristate "X86 package temperature thermal driver" depends on X86_THERMAL_VECTOR -diff -Nur linux-3.15.4/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile ---- linux-3.15.4/drivers/thermal/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/thermal/Makefile 2014-07-07 10:45:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/thermal/Makefile linux-3.15.6/drivers/thermal/Makefile +--- linux-3.15.6.orig/drivers/thermal/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/thermal/Makefile 2014-07-25 15:20:18.588639395 +0200 @@ -28,6 +28,7 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o @@ -36246,9 +36246,9 @@ diff -Nur linux-3.15.4/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefi obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ obj-$(CONFIG_ACPI_INT3403_THERMAL) += int3403_thermal.o -diff -Nur linux-3.15.4/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c ---- linux-3.15.4/drivers/tty/serial/amba-pl011.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/tty/serial/amba-pl011.c 2014-07-07 10:45:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/tty/serial/amba-pl011.c linux-3.15.6/drivers/tty/serial/amba-pl011.c +--- linux-3.15.6.orig/drivers/tty/serial/amba-pl011.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/tty/serial/amba-pl011.c 2014-07-25 15:20:18.588639395 +0200 @@ -84,7 +84,7 @@ static unsigned int get_fifosize_arm(struct amba_device *dev) @@ -36258,9 +36258,9 @@ diff -Nur linux-3.15.4/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/ser } static struct vendor_data vendor_arm = { -diff -Nur linux-3.15.4/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c ---- linux-3.15.4/drivers/usb/core/generic.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/core/generic.c 2014-07-07 10:45:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/core/generic.c linux-3.15.6/drivers/usb/core/generic.c +--- linux-3.15.6.orig/drivers/usb/core/generic.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/core/generic.c 2014-07-25 15:20:18.588639395 +0200 @@ -152,6 +152,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -36269,9 +36269,9 @@ diff -Nur linux-3.15.4/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/gen } return i; } -diff -Nur linux-3.15.4/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c ---- linux-3.15.4/drivers/usb/core/message.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/core/message.c 2014-07-07 10:45:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/core/message.c linux-3.15.6/drivers/usb/core/message.c +--- linux-3.15.6.orig/drivers/usb/core/message.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/core/message.c 2014-07-25 15:20:18.588639395 +0200 @@ -1891,6 +1891,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -36358,9 +36358,9 @@ diff -Nur linux-3.15.4/drivers/usb/core/message.c linux-rpi/drivers/usb/core/mes /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Nur linux-3.15.4/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h ---- linux-3.15.4/drivers/usb/core/otg_whitelist.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/core/otg_whitelist.h 2014-07-07 10:45:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/core/otg_whitelist.h linux-3.15.6/drivers/usb/core/otg_whitelist.h +--- linux-3.15.6.orig/drivers/usb/core/otg_whitelist.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/core/otg_whitelist.h 2014-07-25 15:20:18.588639395 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -36576,9 +36576,9 @@ diff -Nur linux-3.15.4/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/co #endif } -diff -Nur linux-3.15.4/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c ---- linux-3.15.4/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/gadget/file_storage.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/gadget/file_storage.c linux-3.15.6/drivers/usb/gadget/file_storage.c +--- linux-3.15.6.orig/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/gadget/file_storage.c 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,3676 @@ +/* + * file_storage.c -- File-backed USB Storage Gadget, for USB development @@ -40256,9 +40256,9 @@ diff -Nur linux-3.15.4/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/g + kref_put(&fsg->ref, fsg_release); +} +module_exit(fsg_cleanup); -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt ---- linux-3.15.4/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/changes.txt 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3.15.6/drivers/usb/host/dwc_common_port/changes.txt +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/changes.txt 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -40434,9 +40434,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/dr +A DWC_LIBMODULE #define has also been added. If this is not defined, then the +module code in dwc_common_linux.c is not compiled in. This allows linking the +library code directly into a driver module, instead of as a standalone module. -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-3.15.4/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.15.6/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -40708,9 +40708,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rp +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -41244,9 +41244,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drive +} + +#endif /* DWC_CCLIB */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,224 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -41472,9 +41472,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drive +#endif + +#endif /* _DWC_CC_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-07-25 15:20:18.592639424 +0200 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -42784,9 +42784,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-07-25 15:20:18.596639452 +0200 @@ -0,0 +1,1432 @@ +#include <linux/kernel.h> +#include <linux/init.h> @@ -44220,9 +44220,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-07-25 15:20:18.632639709 +0200 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -45499,9 +45499,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-07-25 15:20:18.868641390 +0200 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -45811,9 +45811,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/d +} + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -45926,9 +45926,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/d +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -46221,9 +46221,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drive +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -46331,9 +46331,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drive +#endif + +#endif /* _DWC_DH_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_list.h 2014-07-25 15:20:18.944641934 +0200 @@ -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 $ */ @@ -46929,9 +46929,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/dri +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -47178,9 +47178,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/driv +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -47818,9 +47818,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/d +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -47856,9 +47856,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/d +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -48179,9 +48179,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -48305,9 +48305,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/dwc_os.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,1262 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -49571,9 +49571,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drive +#endif + +#endif /* _DWC_OS_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -49633,9 +49633,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drive + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -49654,9 +49654,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/ + dwc_common_fbsd.c dwc_mem.c + +.include <bsd.kmod.mk> -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/Makefile.linux 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -49707,9 +49707,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.15.4/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/usb.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.15.6/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_common_port/usb.h 2014-07-25 15:20:18.944641934 +0200 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50657,9 +50657,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/ +#endif + +#endif /* _USB_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-3.15.4/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.15.6/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -50885,9 +50885,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/driver +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.15.6/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dummy_audio.c 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -52464,9 +52464,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -52610,9 +52610,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drive +typedef struct cfi_string cfi_string_t; + +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -53468,9 +53468,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/ +#endif + return 1; +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -53552,9 +53552,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/ +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -54766,9 +54766,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-07-25 15:20:18.948641961 +0200 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -54859,9 +54859,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers +#endif + ); +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-07-25 15:20:19.076642874 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -56739,9 +56739,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/ +} + +#endif //DWC_UTE_CFI -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-07-25 15:20:19.076642874 +0200 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -57063,9 +57063,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/ +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-07-25 15:20:19.080642903 +0200 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -64218,9 +64218,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/ + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-07-25 15:20:19.080642903 +0200 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -65686,9 +65686,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/ +////////////////////////////////////////////////////////////////////// + +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-07-25 15:20:19.080642903 +0200 @@ -0,0 +1,1594 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -67284,9 +67284,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/dri + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-07-25 15:20:19.080642903 +0200 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -67993,9 +67993,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/driv +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-07-25 15:20:19.080642903 +0200 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -68114,9 +68114,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/ + +#endif /*DEBUG*/ +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,1749 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -69867,9 +69867,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drive + </td></tr> + +*/ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -69957,9 +69957,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drive +#endif + +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,1294 @@ +/* + * dwc_otg_fiq_fsm.c - The finite state machine FIQ @@ -71255,9 +71255,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/driv + state->fiq_done++; + mb(); +} -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,353 @@ +/* + * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions @@ -71612,9 +71612,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/driv +extern void dwc_otg_fiq_nop(struct fiq_state *state); + +#endif /* DWC_OTG_FIQ_FSM_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,81 @@ +/* + * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ @@ -71697,9 +71697,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/dri +_dwc_otg_fiq_stub_end: +END(_dwc_otg_fiq_stub) + -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,4212 @@ + +/* ========================================================================== @@ -75913,9 +75913,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-07-25 15:20:19.084642931 +0200 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -77049,9 +77049,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/dri +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,862 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -77915,9 +77915,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -78336,9 +78336,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drive + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,2688 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -81028,9 +81028,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/dri + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,985 @@ + +/* ========================================================================== @@ -82017,9 +82017,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,942 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -82963,9 +82963,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -83155,9 +83155,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drive + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -85867,9 +85867,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -86137,9 +86137,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/ +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-07-25 15:20:19.088642959 +0200 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -86501,9 +86501,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drive +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-07-25 15:20:19.092642988 +0200 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -91652,9 +91652,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/dri +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-07-25 15:20:19.092642988 +0200 @@ -0,0 +1,1360 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -93016,9 +93016,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/dr +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-07-25 15:20:19.092642988 +0200 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -95570,9 +95570,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers +} gpwrdn_data_t; + +#endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile ---- linux-3.15.4/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/Makefile linux-3.15.6/drivers/usb/host/dwc_otg/Makefile +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/Makefile 2014-07-25 15:20:19.092642988 +0200 @@ -0,0 +1,82 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -95656,9 +95656,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/h + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-3.15.4/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.15.6/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-07-25 15:20:19.096643017 +0200 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -95997,9 +95997,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/d +); + +1; -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.15.4/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2014-04-13 17:33:11.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.15.6/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/test/Makefile 2014-07-25 15:20:19.096643017 +0200 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -96017,9 +96017,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/ + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-3.15.4/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.15.6/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-07-25 15:20:19.096643017 +0200 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -96154,9 +96154,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.15.4/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.15.6/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.15.6.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-07-25 15:20:19.096643017 +0200 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -96351,9 +96351,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/dri + +test_main(); +0; -diff -Nur linux-3.15.4/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig ---- linux-3.15.4/drivers/usb/host/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/host/Kconfig 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/Kconfig linux-3.15.6/drivers/usb/host/Kconfig +--- linux-3.15.6.orig/drivers/usb/host/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/host/Kconfig 2014-07-25 15:20:19.096643017 +0200 @@ -685,6 +685,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -96374,9 +96374,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconf config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC -diff -Nur linux-3.15.4/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile ---- linux-3.15.4/drivers/usb/host/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/host/Makefile 2014-07-07 10:45:43.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/host/Makefile linux-3.15.6/drivers/usb/host/Makefile +--- linux-3.15.6.orig/drivers/usb/host/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/host/Makefile 2014-07-25 15:20:19.096643017 +0200 @@ -63,6 +63,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -96386,9 +96386,9 @@ diff -Nur linux-3.15.4/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Make obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Nur linux-3.15.4/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile ---- linux-3.15.4/drivers/usb/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/usb/Makefile 2014-07-07 10:45:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/usb/Makefile linux-3.15.6/drivers/usb/Makefile +--- linux-3.15.6.orig/drivers/usb/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/usb/Makefile 2014-07-25 15:20:19.100643046 +0200 @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -96397,9 +96397,9 @@ diff -Nur linux-3.15.4/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ obj-$(CONFIG_USB_FUSBH200_HCD) += host/ -diff -Nur linux-3.15.4/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c ---- linux-3.15.4/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2014-07-07 10:45:46.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/fbdev/bcm2708_fb.c linux-3.15.6/drivers/video/fbdev/bcm2708_fb.c +--- linux-3.15.6.orig/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/video/fbdev/bcm2708_fb.c 2014-07-25 15:20:19.100643046 +0200 @@ -0,0 +1,765 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -97166,9 +97166,9 @@ diff -Nur linux-3.15.4/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/ +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); -diff -Nur linux-3.15.4/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c ---- linux-3.15.4/drivers/video/fbdev/core/cfbimgblt.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2014-07-07 10:45:46.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/fbdev/core/cfbimgblt.c linux-3.15.6/drivers/video/fbdev/core/cfbimgblt.c +--- linux-3.15.6.orig/drivers/video/fbdev/core/cfbimgblt.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/video/fbdev/core/cfbimgblt.c 2014-07-25 15:20:19.100643046 +0200 @@ -28,6 +28,11 @@ * * Also need to add code to deal with cards endians that are different than @@ -97342,9 +97342,9 @@ diff -Nur linux-3.15.4/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/vi slow_imageblit(image, p, dst1, fgcolor, bgcolor, start_index, pitch_index); } else -diff -Nur linux-3.15.4/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c ---- linux-3.15.4/drivers/video/fbdev/core/fbmem.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2014-07-07 10:45:46.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/fbdev/core/fbmem.c linux-3.15.6/drivers/video/fbdev/core/fbmem.c +--- linux-3.15.6.orig/drivers/video/fbdev/core/fbmem.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/video/fbdev/core/fbmem.c 2014-07-25 15:20:19.100643046 +0200 @@ -1083,6 +1083,25 @@ } EXPORT_SYMBOL(fb_blank); @@ -97403,9 +97403,9 @@ diff -Nur linux-3.15.4/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/ arg = (unsigned long) compat_ptr(arg); case FBIOBLANK: ret = do_fb_ioctl(info, cmd, arg); -diff -Nur linux-3.15.4/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig ---- linux-3.15.4/drivers/video/fbdev/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/video/fbdev/Kconfig 2014-07-07 10:45:46.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/fbdev/Kconfig linux-3.15.6/drivers/video/fbdev/Kconfig +--- linux-3.15.6.orig/drivers/video/fbdev/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/video/fbdev/Kconfig 2014-07-25 15:20:19.100643046 +0200 @@ -220,6 +220,20 @@ comment "Frame buffer hardware drivers" depends on FB @@ -97427,9 +97427,9 @@ diff -Nur linux-3.15.4/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev config FB_GRVGA tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC -diff -Nur linux-3.15.4/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile ---- linux-3.15.4/drivers/video/fbdev/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/video/fbdev/Makefile 2014-07-07 10:45:46.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/fbdev/Makefile linux-3.15.6/drivers/video/fbdev/Makefile +--- linux-3.15.6.orig/drivers/video/fbdev/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/video/fbdev/Makefile 2014-07-25 15:20:19.100643046 +0200 @@ -12,6 +12,7 @@ obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o @@ -97438,9 +97438,9 @@ diff -Nur linux-3.15.4/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbde obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o -diff -Nur linux-3.15.4/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.15.4/drivers/video/logo/logo_linux_clut224.ppm 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2014-04-13 17:33:14.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.15.6/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.15.6.orig/drivers/video/logo/logo_linux_clut224.ppm 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/video/logo/logo_linux_clut224.ppm 2014-07-25 15:20:19.104643073 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -99927,9 +99927,9 @@ diff -Nur linux-3.15.4/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drive +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff -Nur linux-3.15.4/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c ---- linux-3.15.4/drivers/w1/masters/w1-gpio.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/w1/masters/w1-gpio.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/w1/masters/w1-gpio.c linux-3.15.6/drivers/w1/masters/w1-gpio.c +--- linux-3.15.6.orig/drivers/w1/masters/w1-gpio.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/w1/masters/w1-gpio.c 2014-07-25 15:20:19.104643073 +0200 @@ -23,6 +23,15 @@ #include "../w1.h" #include "../w1_int.h" @@ -100029,9 +100029,9 @@ diff -Nur linux-3.15.4/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters return 0; } -diff -Nur linux-3.15.4/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h ---- linux-3.15.4/drivers/w1/w1.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/w1/w1.h 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/w1/w1.h linux-3.15.6/drivers/w1/w1.h +--- linux-3.15.6.orig/drivers/w1/w1.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/w1/w1.h 2014-07-25 15:20:19.104643073 +0200 @@ -171,6 +171,12 @@ u8 (*set_pullup)(void *, int); @@ -100045,9 +100045,9 @@ diff -Nur linux-3.15.4/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h void (*search)(void *, struct w1_master *, u8, w1_slave_found_callback); }; -diff -Nur linux-3.15.4/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c ---- linux-3.15.4/drivers/w1/w1_int.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/w1/w1_int.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/w1/w1_int.c linux-3.15.6/drivers/w1/w1_int.c +--- linux-3.15.6.orig/drivers/w1/w1_int.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/w1/w1_int.c 2014-07-25 15:20:19.104643073 +0200 @@ -124,6 +124,20 @@ return(-EINVAL); } @@ -100069,9 +100069,9 @@ diff -Nur linux-3.15.4/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c /* Lock until the device is added (or not) to w1_masters. */ mutex_lock(&w1_mlock); /* Search for the first available id (starting at 1). */ -diff -Nur linux-3.15.4/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c ---- linux-3.15.4/drivers/w1/w1_io.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/w1/w1_io.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/w1/w1_io.c linux-3.15.6/drivers/w1/w1_io.c +--- linux-3.15.6.orig/drivers/w1/w1_io.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/w1/w1_io.c 2014-07-25 15:20:19.104643073 +0200 @@ -134,10 +134,22 @@ static void w1_post_write(struct w1_master *dev) { @@ -100098,9 +100098,9 @@ diff -Nur linux-3.15.4/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -diff -Nur linux-3.15.4/drivers/watchdog/ath79_wdt.c linux-rpi/drivers/watchdog/ath79_wdt.c ---- linux-3.15.4/drivers/watchdog/ath79_wdt.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/watchdog/ath79_wdt.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/ath79_wdt.c linux-3.15.6/drivers/watchdog/ath79_wdt.c +--- linux-3.15.6.orig/drivers/watchdog/ath79_wdt.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/watchdog/ath79_wdt.c 2014-07-25 15:20:19.104643073 +0200 @@ -20,7 +20,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -100125,9 +100125,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/ath79_wdt.c linux-rpi/drivers/watchdog/a ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR); /* flush write */ ath79_wdt_rr(WDOG_REG_CTRL); -diff -Nur linux-3.15.4/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c ---- linux-3.15.4/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/bcm2708_wdog.c linux-3.15.6/drivers/watchdog/bcm2708_wdog.c +--- linux-3.15.6.orig/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/drivers/watchdog/bcm2708_wdog.c 2014-07-25 15:20:19.108643102 +0200 @@ -0,0 +1,382 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -100511,9 +100511,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdo +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.15.4/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig ---- linux-3.15.4/drivers/watchdog/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/watchdog/Kconfig 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/Kconfig linux-3.15.6/drivers/watchdog/Kconfig +--- linux-3.15.6.orig/drivers/watchdog/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/watchdog/Kconfig 2014-07-25 15:20:19.108643102 +0200 @@ -411,6 +411,12 @@ To compile this driver as a module, choose M here: the module will be called retu_wdt. @@ -100527,9 +100527,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconf config MOXART_WDT tristate "MOXART watchdog" depends on ARCH_MOXART -diff -Nur linux-3.15.4/drivers/watchdog/kempld_wdt.c linux-rpi/drivers/watchdog/kempld_wdt.c ---- linux-3.15.4/drivers/watchdog/kempld_wdt.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/watchdog/kempld_wdt.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/kempld_wdt.c linux-3.15.6/drivers/watchdog/kempld_wdt.c +--- linux-3.15.6.orig/drivers/watchdog/kempld_wdt.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/watchdog/kempld_wdt.c 2014-07-25 15:20:19.108643102 +0200 @@ -162,7 +162,7 @@ kempld_get_mutex(pld); stage_cfg = kempld_read8(pld, KEMPLD_WDT_STAGE_CFG(stage->id)); @@ -100539,9 +100539,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/kempld_wdt.c linux-rpi/drivers/watchdog/ kempld_write8(pld, KEMPLD_WDT_STAGE_CFG(stage->id), stage_cfg); kempld_write32(pld, KEMPLD_WDT_STAGE_TIMEOUT(stage->id), stage_timeout); -diff -Nur linux-3.15.4/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile ---- linux-3.15.4/drivers/watchdog/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/watchdog/Makefile 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/Makefile linux-3.15.6/drivers/watchdog/Makefile +--- linux-3.15.6.orig/drivers/watchdog/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/watchdog/Makefile 2014-07-25 15:20:19.108643102 +0200 @@ -54,6 +54,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o @@ -100550,9 +100550,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Make obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o -diff -Nur linux-3.15.4/drivers/watchdog/sp805_wdt.c linux-rpi/drivers/watchdog/sp805_wdt.c ---- linux-3.15.4/drivers/watchdog/sp805_wdt.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/drivers/watchdog/sp805_wdt.c 2014-07-07 10:45:47.000000000 +0200 +diff -Nur linux-3.15.6.orig/drivers/watchdog/sp805_wdt.c linux-3.15.6/drivers/watchdog/sp805_wdt.c +--- linux-3.15.6.orig/drivers/watchdog/sp805_wdt.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/drivers/watchdog/sp805_wdt.c 2014-07-25 15:20:19.108643102 +0200 @@ -59,6 +59,7 @@ * @adev: amba device structure of wdt * @status: current status of wdt @@ -100578,9 +100578,9 @@ diff -Nur linux-3.15.4/drivers/watchdog/sp805_wdt.c linux-rpi/drivers/watchdog/s spin_unlock(&wdt->lock); return 0; -diff -Nur linux-3.15.4/fs/nfs/inode.c linux-rpi/fs/nfs/inode.c ---- linux-3.15.4/fs/nfs/inode.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfs/inode.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfs/inode.c linux-3.15.6/fs/nfs/inode.c +--- linux-3.15.6.orig/fs/nfs/inode.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfs/inode.c 2014-07-25 15:20:19.108643102 +0200 @@ -1575,20 +1575,18 @@ inode->i_version = fattr->change_attr; } @@ -100665,9 +100665,9 @@ diff -Nur linux-3.15.4/fs/nfs/inode.c linux-rpi/fs/nfs/inode.c | NFS_INO_REVAL_FORCED); if (fattr->valid & NFS_ATTR_FATTR_SPACE_USED) { -diff -Nur linux-3.15.4/fs/nfs/nfs4filelayout.c linux-rpi/fs/nfs/nfs4filelayout.c ---- linux-3.15.4/fs/nfs/nfs4filelayout.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfs/nfs4filelayout.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfs/nfs4filelayout.c linux-3.15.6/fs/nfs/nfs4filelayout.c +--- linux-3.15.6.orig/fs/nfs/nfs4filelayout.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfs/nfs4filelayout.c 2014-07-25 15:20:19.108643102 +0200 @@ -1330,7 +1330,7 @@ struct nfs4_filelayout *flo; @@ -100677,9 +100677,9 @@ diff -Nur linux-3.15.4/fs/nfs/nfs4filelayout.c linux-rpi/fs/nfs/nfs4filelayout.c } static void -diff -Nur linux-3.15.4/fs/nfs/nfs4state.c linux-rpi/fs/nfs/nfs4state.c ---- linux-3.15.4/fs/nfs/nfs4state.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfs/nfs4state.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfs/nfs4state.c linux-3.15.6/fs/nfs/nfs4state.c +--- linux-3.15.6.orig/fs/nfs/nfs4state.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfs/nfs4state.c 2014-07-25 15:20:19.112643131 +0200 @@ -1456,7 +1456,7 @@ * server that doesn't support a grace period. */ @@ -100705,9 +100705,9 @@ diff -Nur linux-3.15.4/fs/nfs/nfs4state.c linux-rpi/fs/nfs/nfs4state.c spin_unlock(&sp->so_lock); return status; } -diff -Nur linux-3.15.4/fs/nfs/super.c linux-rpi/fs/nfs/super.c ---- linux-3.15.4/fs/nfs/super.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfs/super.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfs/super.c linux-3.15.6/fs/nfs/super.c +--- linux-3.15.6.orig/fs/nfs/super.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfs/super.c 2014-07-25 15:20:19.112643131 +0200 @@ -2248,7 +2248,6 @@ data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen; data->version = nfsvers; @@ -100716,9 +100716,9 @@ diff -Nur linux-3.15.4/fs/nfs/super.c linux-rpi/fs/nfs/super.c memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr, data->nfs_server.addrlen); -diff -Nur linux-3.15.4/fs/nfs/write.c linux-rpi/fs/nfs/write.c ---- linux-3.15.4/fs/nfs/write.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfs/write.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfs/write.c linux-3.15.6/fs/nfs/write.c +--- linux-3.15.6.orig/fs/nfs/write.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfs/write.c 2014-07-25 15:20:19.112643131 +0200 @@ -913,14 +913,12 @@ if (nfs_have_delegated_attributes(inode)) @@ -100735,9 +100735,9 @@ diff -Nur linux-3.15.4/fs/nfs/write.c linux-rpi/fs/nfs/write.c return PageUptodate(page) != 0; } -diff -Nur linux-3.15.4/fs/nfsd/nfs4state.c linux-rpi/fs/nfsd/nfs4state.c ---- linux-3.15.4/fs/nfsd/nfs4state.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfsd/nfs4state.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/nfsd/nfs4state.c linux-3.15.6/fs/nfsd/nfs4state.c +--- linux-3.15.6.orig/fs/nfsd/nfs4state.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfsd/nfs4state.c 2014-07-25 15:20:19.112643131 +0200 @@ -3726,7 +3726,7 @@ * correspondance, and we have to delete the lockowner when we * delete the lock stateid: @@ -100747,10 +100747,10 @@ diff -Nur linux-3.15.4/fs/nfsd/nfs4state.c linux-rpi/fs/nfsd/nfs4state.c return nfs_ok; } -diff -Nur linux-3.15.4/fs/nfsd/nfs4xdr.c linux-rpi/fs/nfsd/nfs4xdr.c ---- linux-3.15.4/fs/nfsd/nfs4xdr.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/nfsd/nfs4xdr.c 2014-07-07 10:45:51.000000000 +0200 -@@ -2095,8 +2095,8 @@ +diff -Nur linux-3.15.6.orig/fs/nfsd/nfs4xdr.c linux-3.15.6/fs/nfsd/nfs4xdr.c +--- linux-3.15.6.orig/fs/nfsd/nfs4xdr.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/nfsd/nfs4xdr.c 2014-07-25 15:20:19.112643131 +0200 +@@ -2106,8 +2106,8 @@ err = vfs_getattr(&path, &stat); if (err) goto out_nfserr; @@ -100761,9 +100761,9 @@ diff -Nur linux-3.15.4/fs/nfsd/nfs4xdr.c linux-rpi/fs/nfsd/nfs4xdr.c (bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE | FATTR4_WORD1_SPACE_TOTAL))) { err = vfs_statfs(&path, &statfs); -diff -Nur linux-3.15.4/fs/reiserfs/inode.c linux-rpi/fs/reiserfs/inode.c ---- linux-3.15.4/fs/reiserfs/inode.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/reiserfs/inode.c 2014-07-07 10:45:51.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/reiserfs/inode.c linux-3.15.6/fs/reiserfs/inode.c +--- linux-3.15.6.orig/fs/reiserfs/inode.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/reiserfs/inode.c 2014-07-25 15:20:19.116643159 +0200 @@ -3220,14 +3220,8 @@ attr->ia_size != i_size_read(inode)) { error = inode_newsize_ok(inode, attr->ia_size); @@ -100780,9 +100780,9 @@ diff -Nur linux-3.15.4/fs/reiserfs/inode.c linux-rpi/fs/reiserfs/inode.c } } -diff -Nur linux-3.15.4/fs/ubifs/file.c linux-rpi/fs/ubifs/file.c ---- linux-3.15.4/fs/ubifs/file.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/ubifs/file.c 2014-07-07 10:45:52.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/ubifs/file.c linux-3.15.6/fs/ubifs/file.c +--- linux-3.15.6.orig/fs/ubifs/file.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/ubifs/file.c 2014-07-25 15:20:19.116643159 +0200 @@ -1525,7 +1525,8 @@ } @@ -100793,9 +100793,9 @@ diff -Nur linux-3.15.4/fs/ubifs/file.c linux-rpi/fs/ubifs/file.c out_unlock: unlock_page(page); -diff -Nur linux-3.15.4/fs/ubifs/shrinker.c linux-rpi/fs/ubifs/shrinker.c ---- linux-3.15.4/fs/ubifs/shrinker.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/ubifs/shrinker.c 2014-07-07 10:45:52.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/ubifs/shrinker.c linux-3.15.6/fs/ubifs/shrinker.c +--- linux-3.15.6.orig/fs/ubifs/shrinker.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/ubifs/shrinker.c 2014-07-25 15:20:19.116643159 +0200 @@ -128,6 +128,7 @@ freed = ubifs_destroy_tnc_subtree(znode); atomic_long_sub(freed, &ubifs_clean_zn_cnt); @@ -100804,9 +100804,9 @@ diff -Nur linux-3.15.4/fs/ubifs/shrinker.c linux-rpi/fs/ubifs/shrinker.c total_freed += freed; znode = zprev; } -diff -Nur linux-3.15.4/fs/xfs/xfs_mount.c linux-rpi/fs/xfs/xfs_mount.c ---- linux-3.15.4/fs/xfs/xfs_mount.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/fs/xfs/xfs_mount.c 2014-07-07 10:45:52.000000000 +0200 +diff -Nur linux-3.15.6.orig/fs/xfs/xfs_mount.c linux-3.15.6/fs/xfs/xfs_mount.c +--- linux-3.15.6.orig/fs/xfs/xfs_mount.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/fs/xfs/xfs_mount.c 2014-07-25 15:20:19.116643159 +0200 @@ -323,19 +323,8 @@ /* * Initialize the mount structure from the superblock. @@ -100845,9 +100845,9 @@ diff -Nur linux-3.15.4/fs/xfs/xfs_mount.c linux-rpi/fs/xfs/xfs_mount.c xfs_buf_relse(bp); sector_size = sbp->sb_sectsize; buf_ops = loud ? &xfs_sb_buf_ops : &xfs_sb_quiet_buf_ops; -diff -Nur linux-3.15.4/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h ---- linux-3.15.4/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/broadcom/vc_cma.h 2014-07-07 10:45:52.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/linux/broadcom/vc_cma.h linux-3.15.6/include/linux/broadcom/vc_cma.h +--- linux-3.15.6.orig/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/include/linux/broadcom/vc_cma.h 2014-07-25 15:20:19.116643159 +0200 @@ -0,0 +1,29 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -100878,9 +100878,9 @@ diff -Nur linux-3.15.4/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/b +#endif + +#endif /* VC_CMA_H */ -diff -Nur linux-3.15.4/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h ---- linux-3.15.4/include/linux/mmc/host.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/linux/mmc/host.h 2014-07-07 10:45:53.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/linux/mmc/host.h linux-3.15.6/include/linux/mmc/host.h +--- linux-3.15.6.orig/include/linux/mmc/host.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/linux/mmc/host.h 2014-07-25 15:20:19.120643188 +0200 @@ -278,6 +278,7 @@ #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ MMC_CAP2_PACKED_WR) @@ -100889,9 +100889,9 @@ diff -Nur linux-3.15.4/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host mmc_pm_flag_t pm_caps; /* supported pm features */ -diff -Nur linux-3.15.4/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h ---- linux-3.15.4/include/linux/mmc/sdhci.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/linux/mmc/sdhci.h 2014-07-07 10:45:53.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/linux/mmc/sdhci.h linux-3.15.6/include/linux/mmc/sdhci.h +--- linux-3.15.6.orig/include/linux/mmc/sdhci.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/linux/mmc/sdhci.h 2014-07-25 15:20:19.120643188 +0200 @@ -104,6 +104,7 @@ #define SDHCI_QUIRK2_BROKEN_DDR50 (1<<7) @@ -100916,9 +100916,9 @@ diff -Nur linux-3.15.4/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdh struct mmc_data *data; /* Current data request */ unsigned int data_early:1; /* Data finished before cmd */ -diff -Nur linux-3.15.4/include/linux/ptrace.h linux-rpi/include/linux/ptrace.h ---- linux-3.15.4/include/linux/ptrace.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/linux/ptrace.h 2014-07-07 10:45:53.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/linux/ptrace.h linux-3.15.6/include/linux/ptrace.h +--- linux-3.15.6.orig/include/linux/ptrace.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/linux/ptrace.h 2014-07-25 15:20:19.120643188 +0200 @@ -334,9 +334,6 @@ * calling arch_ptrace_stop() when it would be superfluous. For example, * if the thread has not been back to user mode since the last stop, the @@ -100929,9 +100929,9 @@ diff -Nur linux-3.15.4/include/linux/ptrace.h linux-rpi/include/linux/ptrace.h */ #define arch_ptrace_stop_needed(code, info) (0) #endif -diff -Nur linux-3.15.4/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h ---- linux-3.15.4/include/linux/vmstat.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/linux/vmstat.h 2014-07-07 10:45:55.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/linux/vmstat.h linux-3.15.6/include/linux/vmstat.h +--- linux-3.15.6.orig/include/linux/vmstat.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/linux/vmstat.h 2014-07-25 15:20:19.120643188 +0200 @@ -235,7 +235,11 @@ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -100944,9 +100944,9 @@ diff -Nur linux-3.15.4/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h } static inline void __inc_zone_page_state(struct page *page, -diff -Nur linux-3.15.4/include/trace/syscall.h linux-rpi/include/trace/syscall.h ---- linux-3.15.4/include/trace/syscall.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/trace/syscall.h 2014-07-07 10:45:56.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/trace/syscall.h linux-3.15.6/include/trace/syscall.h +--- linux-3.15.6.orig/include/trace/syscall.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/trace/syscall.h 2014-07-25 15:20:19.120643188 +0200 @@ -4,7 +4,6 @@ #include <linux/tracepoint.h> #include <linux/unistd.h> @@ -100974,9 +100974,9 @@ diff -Nur linux-3.15.4/include/trace/syscall.h linux-rpi/include/trace/syscall.h -#endif - #endif /* _TRACE_SYSCALL_H */ -diff -Nur linux-3.15.4/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h ---- linux-3.15.4/include/uapi/linux/fb.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/include/uapi/linux/fb.h 2014-04-13 17:33:21.000000000 +0200 +diff -Nur linux-3.15.6.orig/include/uapi/linux/fb.h linux-3.15.6/include/uapi/linux/fb.h +--- linux-3.15.6.orig/include/uapi/linux/fb.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/include/uapi/linux/fb.h 2014-07-25 15:20:19.120643188 +0200 @@ -34,6 +34,11 @@ #define FBIOPUT_MODEINFO 0x4617 #define FBIOGET_DISPINFO 0x4618 @@ -100989,10 +100989,10 @@ diff -Nur linux-3.15.4/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ #define FB_TYPE_PLANES 1 /* Non interleaved planes */ -diff -Nur linux-3.15.4/kernel/cgroup.c linux-rpi/kernel/cgroup.c ---- linux-3.15.4/kernel/cgroup.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/kernel/cgroup.c 2014-07-07 10:45:56.000000000 +0200 -@@ -4620,6 +4620,29 @@ +diff -Nur linux-3.15.6.orig/kernel/cgroup.c linux-3.15.6/kernel/cgroup.c +--- linux-3.15.6.orig/kernel/cgroup.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/kernel/cgroup.c 2014-07-25 15:20:19.124643217 +0200 +@@ -4671,6 +4671,29 @@ } __setup("cgroup_disable=", cgroup_disable); @@ -101022,9 +101022,9 @@ diff -Nur linux-3.15.4/kernel/cgroup.c linux-rpi/kernel/cgroup.c /** * css_tryget_from_dir - get corresponding css from the dentry of a cgroup dir * @dentry: directory dentry of interest -diff -Nur linux-3.15.4/kernel/fork.c linux-rpi/kernel/fork.c ---- linux-3.15.4/kernel/fork.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/kernel/fork.c 2014-07-07 10:45:56.000000000 +0200 +diff -Nur linux-3.15.6.orig/kernel/fork.c linux-3.15.6/kernel/fork.c +--- linux-3.15.6.orig/kernel/fork.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/kernel/fork.c 2014-07-25 15:20:19.124643217 +0200 @@ -1487,9 +1487,7 @@ total_forks++; @@ -101035,10 +101035,10 @@ diff -Nur linux-3.15.4/kernel/fork.c linux-rpi/kernel/fork.c proc_fork_connector(p); cgroup_post_fork(p); if (clone_flags & CLONE_THREAD) -diff -Nur linux-3.15.4/kernel/trace/trace.c linux-rpi/kernel/trace/trace.c ---- linux-3.15.4/kernel/trace/trace.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/kernel/trace/trace.c 2014-07-07 10:45:57.000000000 +0200 -@@ -1461,12 +1461,12 @@ +diff -Nur linux-3.15.6.orig/kernel/trace/trace.c linux-3.15.6/kernel/trace/trace.c +--- linux-3.15.6.orig/kernel/trace/trace.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/kernel/trace/trace.c 2014-07-25 15:20:19.124643217 +0200 +@@ -1459,12 +1459,12 @@ void trace_stop_cmdline_recording(void); @@ -101053,7 +101053,7 @@ diff -Nur linux-3.15.4/kernel/trace/trace.c linux-rpi/kernel/trace/trace.c /* * It's not the end of the world if we don't get -@@ -1475,7 +1475,7 @@ +@@ -1473,7 +1473,7 @@ * so if we miss here, then better luck next time. */ if (!arch_spin_trylock(&trace_cmdline_lock)) @@ -101062,7 +101062,7 @@ diff -Nur linux-3.15.4/kernel/trace/trace.c linux-rpi/kernel/trace/trace.c idx = map_pid_to_cmdline[tsk->pid]; if (idx == NO_CMDLINE_MAP) { -@@ -1500,8 +1500,6 @@ +@@ -1498,8 +1498,6 @@ memcpy(&saved_cmdlines[idx], tsk->comm, TASK_COMM_LEN); arch_spin_unlock(&trace_cmdline_lock); @@ -101071,7 +101071,7 @@ diff -Nur linux-3.15.4/kernel/trace/trace.c linux-rpi/kernel/trace/trace.c } void trace_find_cmdline(int pid, char comm[]) -@@ -1543,8 +1541,9 @@ +@@ -1541,8 +1539,9 @@ if (!__this_cpu_read(trace_cmdline_save)) return; @@ -101083,9 +101083,9 @@ diff -Nur linux-3.15.4/kernel/trace/trace.c linux-rpi/kernel/trace/trace.c } void -diff -Nur linux-3.15.4/kernel/watchdog.c linux-rpi/kernel/watchdog.c ---- linux-3.15.4/kernel/watchdog.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/kernel/watchdog.c 2014-07-07 10:45:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/kernel/watchdog.c linux-3.15.6/kernel/watchdog.c +--- linux-3.15.6.orig/kernel/watchdog.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/kernel/watchdog.c 2014-07-25 15:20:19.124643217 +0200 @@ -527,8 +527,10 @@ int cpu; @@ -101097,9 +101097,9 @@ diff -Nur linux-3.15.4/kernel/watchdog.c linux-rpi/kernel/watchdog.c put_online_cpus(); } -diff -Nur linux-3.15.4/lib/lz4/lz4_decompress.c linux-rpi/lib/lz4/lz4_decompress.c ---- linux-3.15.4/lib/lz4/lz4_decompress.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/lib/lz4/lz4_decompress.c 2014-07-07 10:45:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/lib/lz4/lz4_decompress.c linux-3.15.6/lib/lz4/lz4_decompress.c +--- linux-3.15.6.orig/lib/lz4/lz4_decompress.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/lib/lz4/lz4_decompress.c 2014-07-25 15:20:19.128643245 +0200 @@ -192,8 +192,6 @@ int s = 255; while ((ip < iend) && (s == 255)) { @@ -101127,9 +101127,9 @@ diff -Nur linux-3.15.4/lib/lz4/lz4_decompress.c linux-rpi/lib/lz4/lz4_decompress } int lz4_decompress(const unsigned char *src, size_t *src_len, -diff -Nur linux-3.15.4/mm/memcontrol.c linux-rpi/mm/memcontrol.c ---- linux-3.15.4/mm/memcontrol.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/mm/memcontrol.c 2014-07-07 10:45:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/mm/memcontrol.c linux-3.15.6/mm/memcontrol.c +--- linux-3.15.6.orig/mm/memcontrol.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/mm/memcontrol.c 2014-07-25 15:20:19.128643245 +0200 @@ -7158,6 +7158,7 @@ .bind = mem_cgroup_bind, .base_cftypes = mem_cgroup_files, @@ -101138,9 +101138,9 @@ diff -Nur linux-3.15.4/mm/memcontrol.c linux-rpi/mm/memcontrol.c }; #ifdef CONFIG_MEMCG_SWAP -diff -Nur linux-3.15.4/net/sunrpc/svc_xprt.c linux-rpi/net/sunrpc/svc_xprt.c ---- linux-3.15.4/net/sunrpc/svc_xprt.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/net/sunrpc/svc_xprt.c 2014-07-07 10:46:01.000000000 +0200 +diff -Nur linux-3.15.6.orig/net/sunrpc/svc_xprt.c linux-3.15.6/net/sunrpc/svc_xprt.c +--- linux-3.15.6.orig/net/sunrpc/svc_xprt.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/net/sunrpc/svc_xprt.c 2014-07-25 15:20:19.128643245 +0200 @@ -730,8 +730,6 @@ newxpt = xprt->xpt_ops->xpo_accept(xprt); if (newxpt) @@ -101150,9 +101150,9 @@ diff -Nur linux-3.15.4/net/sunrpc/svc_xprt.c linux-rpi/net/sunrpc/svc_xprt.c } else if (xprt->xpt_ops->xpo_has_wspace(xprt)) { /* XPT_DATA|XPT_DEFERRED case: */ dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n", -diff -Nur linux-3.15.4/scripts/recordmcount.h linux-rpi/scripts/recordmcount.h ---- linux-3.15.4/scripts/recordmcount.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/scripts/recordmcount.h 2014-04-13 17:33:26.000000000 +0200 +diff -Nur linux-3.15.6.orig/scripts/recordmcount.h linux-3.15.6/scripts/recordmcount.h +--- linux-3.15.6.orig/scripts/recordmcount.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/scripts/recordmcount.h 2014-07-25 15:20:19.128643245 +0200 @@ -163,11 +163,11 @@ static int MIPS_is_fake_mcount(Elf_Rel const *rp) @@ -101167,9 +101167,9 @@ diff -Nur linux-3.15.4/scripts/recordmcount.h linux-rpi/scripts/recordmcount.h (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET); old_r_offset = current_r_offset; -diff -Nur linux-3.15.4/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c ---- linux-3.15.4/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/bcm2835.c linux-3.15.6/sound/arm/bcm2835.c +--- linux-3.15.6.orig/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/bcm2835.c 2014-07-25 15:20:19.128643245 +0200 @@ -0,0 +1,420 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -101591,9 +101591,9 @@ diff -Nur linux-3.15.4/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Nur linux-3.15.4/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c ---- linux-3.15.4/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-ctl.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/bcm2835-ctl.c linux-3.15.6/sound/arm/bcm2835-ctl.c +--- linux-3.15.6.orig/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/bcm2835-ctl.c 2014-07-25 15:20:19.128643245 +0200 @@ -0,0 +1,323 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -101918,9 +101918,9 @@ diff -Nur linux-3.15.4/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c + } + return 0; +} -diff -Nur linux-3.15.4/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h ---- linux-3.15.4/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.h 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/bcm2835.h linux-3.15.6/sound/arm/bcm2835.h +--- linux-3.15.6.orig/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/bcm2835.h 2014-07-25 15:20:19.132643273 +0200 @@ -0,0 +1,166 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -102088,9 +102088,9 @@ diff -Nur linux-3.15.4/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Nur linux-3.15.4/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c ---- linux-3.15.4/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-pcm.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/bcm2835-pcm.c linux-3.15.6/sound/arm/bcm2835-pcm.c +--- linux-3.15.6.orig/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/bcm2835-pcm.c 2014-07-25 15:20:19.132643273 +0200 @@ -0,0 +1,518 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -102610,9 +102610,9 @@ diff -Nur linux-3.15.4/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c + + return 0; +} -diff -Nur linux-3.15.4/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c ---- linux-3.15.4/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-vchiq.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/bcm2835-vchiq.c linux-3.15.6/sound/arm/bcm2835-vchiq.c +--- linux-3.15.6.orig/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/bcm2835-vchiq.c 2014-07-25 15:20:19.132643273 +0200 @@ -0,0 +1,879 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -103493,9 +103493,9 @@ diff -Nur linux-3.15.4/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vch + +module_param(force_bulk, bool, 0444); +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); -diff -Nur linux-3.15.4/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig ---- linux-3.15.4/sound/arm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/arm/Kconfig 2014-04-13 17:33:26.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/Kconfig linux-3.15.6/sound/arm/Kconfig +--- linux-3.15.6.orig/sound/arm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/arm/Kconfig 2014-07-25 15:20:19.132643273 +0200 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -103509,9 +103509,9 @@ diff -Nur linux-3.15.4/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig + endif # SND_ARM -diff -Nur linux-3.15.4/sound/arm/Makefile linux-rpi/sound/arm/Makefile ---- linux-3.15.4/sound/arm/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/arm/Makefile 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/Makefile linux-3.15.6/sound/arm/Makefile +--- linux-3.15.6.orig/sound/arm/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/arm/Makefile 2014-07-25 15:20:19.132643273 +0200 @@ -14,3 +14,8 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -103521,9 +103521,9 @@ diff -Nur linux-3.15.4/sound/arm/Makefile linux-rpi/sound/arm/Makefile +snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o + +ccflags-y += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff -Nur linux-3.15.4/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.15.4/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2014-04-13 17:33:26.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.15.6/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.15.6.orig/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/arm/vc_vchi_audioserv_defs.h 2014-07-25 15:20:19.132643273 +0200 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -103641,154 +103641,9 @@ diff -Nur linux-3.15.4/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Nur linux-3.15.4/sound/pci/hda/hda_intel.c linux-rpi/sound/pci/hda/hda_intel.c ---- linux-3.15.4/sound/pci/hda/hda_intel.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/pci/hda/hda_intel.c 2014-07-07 10:46:02.000000000 +0200 -@@ -282,24 +282,6 @@ - [AZX_DRIVER_GENERIC] = "HD-Audio Generic", - }; - -- --/* Intel HSW/BDW display HDA controller Extended Mode registers. -- * EM4 (M value) and EM5 (N Value) are used to convert CDClk (Core Display -- * Clock) to 24MHz BCLK: BCLK = CDCLK * M / N -- * The values will be lost when the display power well is disabled. -- */ --#define ICH6_REG_EM4 0x100c --#define ICH6_REG_EM5 0x1010 -- --struct hda_intel { -- struct azx chip; -- -- /* HSW/BDW display HDA controller to restore BCLK from CDCLK */ -- unsigned int bclk_m; -- unsigned int bclk_n; --}; -- -- - #ifdef CONFIG_X86 - static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on) - { -@@ -592,22 +574,6 @@ - #define azx_del_card_list(chip) /* NOP */ - #endif /* CONFIG_PM */ - --static void haswell_save_bclk(struct azx *chip) --{ -- struct hda_intel *hda = container_of(chip, struct hda_intel, chip); -- -- hda->bclk_m = azx_readw(chip, EM4); -- hda->bclk_n = azx_readw(chip, EM5); --} -- --static void haswell_restore_bclk(struct azx *chip) --{ -- struct hda_intel *hda = container_of(chip, struct hda_intel, chip); -- -- azx_writew(chip, EM4, hda->bclk_m); -- azx_writew(chip, EM5, hda->bclk_n); --} -- - #if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO) - /* - * power management -@@ -634,13 +600,6 @@ - free_irq(chip->irq, chip); - chip->irq = -1; - } -- -- /* Save BCLK M/N values before they become invalid in D3. -- * Will test if display power well can be released now. -- */ -- if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) -- haswell_save_bclk(chip); -- - if (chip->msi) - pci_disable_msi(chip->pci); - pci_disable_device(pci); -@@ -660,10 +619,8 @@ - if (chip->disabled) - return 0; - -- if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { -+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) - hda_display_power(true); -- haswell_restore_bclk(chip); -- } - pci_set_power_state(pci, PCI_D0); - pci_restore_state(pci); - if (pci_enable_device(pci) < 0) { -@@ -707,10 +664,8 @@ - azx_stop_chip(chip); - azx_enter_link_reset(chip); - azx_clear_irq_pending(chip); -- if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { -- haswell_save_bclk(chip); -+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) - hda_display_power(false); -- } - return 0; - } - -@@ -728,10 +683,8 @@ - if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) - return 0; - -- if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { -+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) - hda_display_power(true); -- haswell_restore_bclk(chip); -- } - - /* Read STATESTS before controller reset */ - status = azx_readw(chip, STATESTS); -@@ -924,8 +877,6 @@ - static int azx_free(struct azx *chip) - { - struct pci_dev *pci = chip->pci; -- struct hda_intel *hda = container_of(chip, struct hda_intel, chip); -- - int i; - - if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME) -@@ -973,7 +924,7 @@ - hda_display_power(false); - hda_i915_exit(); - } -- kfree(hda); -+ kfree(chip); - - return 0; - } -@@ -1217,7 +1168,6 @@ - static struct snd_device_ops ops = { - .dev_free = azx_dev_free, - }; -- struct hda_intel *hda; - struct azx *chip; - int err; - -@@ -1227,14 +1177,13 @@ - if (err < 0) - return err; - -- hda = kzalloc(sizeof(*hda), GFP_KERNEL); -- if (!hda) { -- dev_err(card->dev, "Cannot allocate hda\n"); -+ chip = kzalloc(sizeof(*chip), GFP_KERNEL); -+ if (!chip) { -+ dev_err(card->dev, "Cannot allocate chip\n"); - pci_disable_device(pci); - return -ENOMEM; - } - -- chip = &hda->chip; - spin_lock_init(&chip->reg_lock); - mutex_init(&chip->open_mutex); - chip->card = card; -diff -Nur linux-3.15.4/sound/pci/hda/patch_hdmi.c linux-rpi/sound/pci/hda/patch_hdmi.c ---- linux-3.15.4/sound/pci/hda/patch_hdmi.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/pci/hda/patch_hdmi.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/pci/hda/patch_hdmi.c linux-3.15.6/sound/pci/hda/patch_hdmi.c +--- linux-3.15.6.orig/sound/pci/hda/patch_hdmi.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/pci/hda/patch_hdmi.c 2014-07-25 15:20:23.628675327 +0200 @@ -2208,7 +2208,7 @@ struct hdmi_spec *spec = codec->spec; int pin_idx; @@ -103798,9 +103653,9 @@ diff -Nur linux-3.15.4/sound/pci/hda/patch_hdmi.c linux-rpi/sound/pci/hda/patch_ snd_hda_codec_resume_amp(codec); snd_hda_codec_resume_cache(codec); -diff -Nur linux-3.15.4/sound/pci/hda/patch_sigmatel.c linux-rpi/sound/pci/hda/patch_sigmatel.c ---- linux-3.15.4/sound/pci/hda/patch_sigmatel.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/pci/hda/patch_sigmatel.c 2014-07-07 10:46:02.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/pci/hda/patch_sigmatel.c linux-3.15.6/sound/pci/hda/patch_sigmatel.c +--- linux-3.15.6.orig/sound/pci/hda/patch_sigmatel.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/pci/hda/patch_sigmatel.c 2014-07-25 15:20:23.632675354 +0200 @@ -122,12 +122,6 @@ }; @@ -103890,9 +103745,9 @@ diff -Nur linux-3.15.4/sound/pci/hda/patch_sigmatel.c linux-rpi/sound/pci/hda/pa return 0; } -diff -Nur linux-3.15.4/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c ---- linux-3.15.4/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.15.6/sound/soc/bcm/bcm2708-i2s.c +--- linux-3.15.6.orig/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/bcm/bcm2708-i2s.c 2014-07-25 15:20:23.632675354 +0200 @@ -0,0 +1,946 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC @@ -104840,9 +104695,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm27 +MODULE_DESCRIPTION("BCM2708 I2S interface"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c ---- linux-3.15.4/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2014-04-13 17:33:28.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/hifiberry_dac.c linux-3.15.6/sound/soc/bcm/hifiberry_dac.c +--- linux-3.15.6.orig/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/bcm/hifiberry_dac.c 2014-07-25 15:20:23.636675382 +0200 @@ -0,0 +1,100 @@ +/* + * ASoC Driver for HifiBerry DAC @@ -104944,9 +104799,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c ---- linux-3.15.4/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/hifiberry_digi.c linux-3.15.6/sound/soc/bcm/hifiberry_digi.c +--- linux-3.15.6.orig/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/bcm/hifiberry_digi.c 2014-07-25 15:20:23.636675382 +0200 @@ -0,0 +1,153 @@ +/* + * ASoC Driver for HifiBerry Digi @@ -105101,9 +104956,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hi +MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c ---- linux-3.15.4/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/iqaudio-dac.c linux-3.15.6/sound/soc/bcm/iqaudio-dac.c +--- linux-3.15.6.orig/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/bcm/iqaudio-dac.c 2014-07-25 15:20:23.640675410 +0200 @@ -0,0 +1,111 @@ +/* + * ASoC Driver for IQaudIO DAC @@ -105216,9 +105071,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaud +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig ---- linux-3.15.4/sound/soc/bcm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/bcm/Kconfig 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/Kconfig linux-3.15.6/sound/soc/bcm/Kconfig +--- linux-3.15.6.orig/sound/soc/bcm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/bcm/Kconfig 2014-07-25 15:20:24.076678520 +0200 @@ -7,3 +7,42 @@ Say Y or M if you want to add support for codecs attached to the BCM2835 I2S interface. You will also need @@ -105262,9 +105117,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig + select SND_SOC_PCM512x + help + Say Y or M if you want to add support for IQaudIO-DAC. -diff -Nur linux-3.15.4/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile ---- linux-3.15.4/sound/soc/bcm/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/bcm/Makefile 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/Makefile linux-3.15.6/sound/soc/bcm/Makefile +--- linux-3.15.6.orig/sound/soc/bcm/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/bcm/Makefile 2014-07-25 15:20:24.524681713 +0200 @@ -3,3 +3,18 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o @@ -105284,9 +105139,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o +obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o +obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o -diff -Nur linux-3.15.4/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c ---- linux-3.15.4/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/rpi-dac.c 2014-04-13 17:33:28.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/bcm/rpi-dac.c linux-3.15.6/sound/soc/bcm/rpi-dac.c +--- linux-3.15.6.orig/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/bcm/rpi-dac.c 2014-07-25 15:20:24.524681713 +0200 @@ -0,0 +1,97 @@ +/* + * ASoC Driver for RPi-DAC. @@ -105385,9 +105240,9 @@ diff -Nur linux-3.15.4/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig ---- linux-3.15.4/sound/soc/codecs/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/Kconfig 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/Kconfig linux-3.15.6/sound/soc/codecs/Kconfig +--- linux-3.15.6.orig/sound/soc/codecs/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/Kconfig 2014-07-25 15:20:26.368694857 +0200 @@ -69,6 +69,9 @@ select SND_SOC_PCM3008 select SND_SOC_PCM512x_I2C if I2C @@ -105414,9 +105269,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconf config SND_SOC_RT5631 tristate -diff -Nur linux-3.15.4/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile ---- linux-3.15.4/sound/soc/codecs/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/Makefile 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/Makefile linux-3.15.6/sound/soc/codecs/Makefile +--- linux-3.15.6.orig/sound/soc/codecs/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/Makefile 2014-07-25 15:20:26.368694857 +0200 @@ -58,6 +58,9 @@ snd-soc-pcm512x-objs := pcm512x.o snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o @@ -105437,9 +105292,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Make obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o -diff -Nur linux-3.15.4/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c ---- linux-3.15.4/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm1794a.c 2014-04-13 17:33:29.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/pcm1794a.c linux-3.15.6/sound/soc/codecs/pcm1794a.c +--- linux-3.15.6.orig/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/codecs/pcm1794a.c 2014-07-25 15:20:26.368694857 +0200 @@ -0,0 +1,62 @@ +/* + * Driver for the PCM1794A codec @@ -105503,9 +105358,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM1794A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c ---- linux-3.15.4/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm5102a.c 2014-04-13 17:33:29.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/pcm5102a.c linux-3.15.6/sound/soc/codecs/pcm5102a.c +--- linux-3.15.6.orig/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/sound/soc/codecs/pcm5102a.c 2014-07-25 15:20:26.684697109 +0200 @@ -0,0 +1,63 @@ +/* + * Driver for the PCM5102A codec @@ -105570,9 +105425,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM5102A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.15.4/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c ---- linux-3.15.4/sound/soc/codecs/pcm512x.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/pcm512x.c 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/pcm512x.c linux-3.15.6/sound/soc/codecs/pcm512x.c +--- linux-3.15.6.orig/sound/soc/codecs/pcm512x.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/pcm512x.c 2014-07-25 15:20:26.688697138 +0200 @@ -18,9 +18,11 @@ #include <linux/init.h> #include <linux/module.h> @@ -105953,9 +105808,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm MODULE_DESCRIPTION("ASoC PCM512x codec driver"); MODULE_AUTHOR("Mark Brown <broonie@linaro.org>"); -diff -Nur linux-3.15.4/sound/soc/codecs/pcm512x.h linux-rpi/sound/soc/codecs/pcm512x.h ---- linux-3.15.4/sound/soc/codecs/pcm512x.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/pcm512x.h 2014-04-13 17:33:29.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/pcm512x.h linux-3.15.6/sound/soc/codecs/pcm512x.h +--- linux-3.15.6.orig/sound/soc/codecs/pcm512x.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/pcm512x.h 2014-07-25 15:20:26.688697138 +0200 @@ -17,81 +17,66 @@ #ifndef _SND_SOC_PCM512X #define _SND_SOC_PCM512X @@ -106113,9 +105968,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/pcm512x.h linux-rpi/sound/soc/codecs/pcm -void pcm512x_remove(struct device *dev); - #endif -diff -Nur linux-3.15.4/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c ---- linux-3.15.4/sound/soc/codecs/wm8804.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/wm8804.c 2014-07-07 10:46:03.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/wm8804.c linux-3.15.6/sound/soc/codecs/wm8804.c +--- linux-3.15.6.orig/sound/soc/codecs/wm8804.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/wm8804.c 2014-07-25 15:20:26.692697167 +0200 @@ -63,6 +63,7 @@ struct regmap *regmap; struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES]; @@ -106201,9 +106056,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm88 .controls = wm8804_snd_controls, .num_controls = ARRAY_SIZE(wm8804_snd_controls), -diff -Nur linux-3.15.4/sound/soc/codecs/wm8804.h linux-rpi/sound/soc/codecs/wm8804.h ---- linux-3.15.4/sound/soc/codecs/wm8804.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/codecs/wm8804.h 2014-04-13 17:33:29.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/codecs/wm8804.h linux-3.15.6/sound/soc/codecs/wm8804.h +--- linux-3.15.6.orig/sound/soc/codecs/wm8804.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/codecs/wm8804.h 2014-07-25 15:20:26.692697167 +0200 @@ -57,5 +57,9 @@ #define WM8804_CLKOUT_SRC_OSCCLK 4 @@ -106214,9 +106069,9 @@ diff -Nur linux-3.15.4/sound/soc/codecs/wm8804.h linux-rpi/sound/soc/codecs/wm88 +#define WM8804_MCLKDIV_128FS 1 #endif /* _WM8804_H */ -diff -Nur linux-3.15.4/sound/soc/soc-core.c linux-rpi/sound/soc/soc-core.c ---- linux-3.15.4/sound/soc/soc-core.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/soc/soc-core.c 2014-07-07 10:46:05.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/soc/soc-core.c linux-3.15.6/sound/soc/soc-core.c +--- linux-3.15.6.orig/sound/soc/soc-core.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/soc/soc-core.c 2014-07-25 15:20:26.696697195 +0200 @@ -3024,8 +3024,8 @@ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; @@ -106275,9 +106130,9 @@ diff -Nur linux-3.15.4/sound/soc/soc-core.c linux-rpi/sound/soc/soc-core.c } return 0; -diff -Nur linux-3.15.4/sound/usb/card.c linux-rpi/sound/usb/card.c ---- linux-3.15.4/sound/usb/card.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/usb/card.c 2014-07-07 10:46:06.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/usb/card.c linux-3.15.6/sound/usb/card.c +--- linux-3.15.6.orig/sound/usb/card.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/usb/card.c 2014-07-25 15:20:26.696697195 +0200 @@ -307,11 +307,6 @@ static int snd_usb_audio_free(struct snd_usb_audio *chip) @@ -106318,9 +106173,9 @@ diff -Nur linux-3.15.4/sound/usb/card.c linux-rpi/sound/usb/card.c } /* release the midi resources */ list_for_each(p, &chip->midi_list) { -diff -Nur linux-3.15.4/sound/usb/endpoint.c linux-rpi/sound/usb/endpoint.c ---- linux-3.15.4/sound/usb/endpoint.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/usb/endpoint.c 2014-07-07 10:46:06.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/usb/endpoint.c linux-3.15.6/sound/usb/endpoint.c +--- linux-3.15.6.orig/sound/usb/endpoint.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/usb/endpoint.c 2014-07-25 15:20:26.696697195 +0200 @@ -987,30 +987,19 @@ } @@ -106355,9 +106210,9 @@ diff -Nur linux-3.15.4/sound/usb/endpoint.c linux-rpi/sound/usb/endpoint.c kfree(ep); } -diff -Nur linux-3.15.4/sound/usb/endpoint.h linux-rpi/sound/usb/endpoint.h ---- linux-3.15.4/sound/usb/endpoint.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/sound/usb/endpoint.h 2014-07-07 10:46:06.000000000 +0200 +diff -Nur linux-3.15.6.orig/sound/usb/endpoint.h linux-3.15.6/sound/usb/endpoint.h +--- linux-3.15.6.orig/sound/usb/endpoint.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/sound/usb/endpoint.h 2014-07-25 15:20:26.696697195 +0200 @@ -23,7 +23,6 @@ void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); |