diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-01-19 14:52:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-01-19 14:52:06 +0100 |
| commit | ff00cdac1c5bdbe4159b081e291717d6349da941 (patch) | |
| tree | 7da7f70be10d3b27452fa76d90d0bb7fb62c61f8 /target | |
| parent | ee0a8b0fb0aa82ff6bbf04990ed74916c1b5f709 (diff) | |
update to latest stable linux kernel
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/raspberry-pi/patches/3.18.3/raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.18.2/raspberry-pi.patch) | 3384 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.choice | 6 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.default | 2 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/bsd-compatibility.patch (renamed from target/linux/patches/3.18.2/bsd-compatibility.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/cleankernel.patch (renamed from target/linux/patches/3.18.2/cleankernel.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/cris-header.patch (renamed from target/linux/patches/3.18.2/cris-header.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/defaults.patch (renamed from target/linux/patches/3.18.2/defaults.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.18.2/export-symbol-for-exmap.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/gemalto.patch (renamed from target/linux/patches/3.18.2/gemalto.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.18.2/initramfs-nosizelimit.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/lemote-rfkill.patch (renamed from target/linux/patches/3.18.2/lemote-rfkill.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/microblaze-axi.patch (renamed from target/linux/patches/3.18.2/microblaze-axi.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/microblaze-ethernet.patch (renamed from target/linux/patches/3.18.2/microblaze-ethernet.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/mkpiggy.patch (renamed from target/linux/patches/3.18.2/mkpiggy.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/mtd-rootfs.patch (renamed from target/linux/patches/3.18.2/mtd-rootfs.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/nfsv3-tcp.patch (renamed from target/linux/patches/3.18.2/nfsv3-tcp.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/non-static.patch (renamed from target/linux/patches/3.18.2/non-static.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/patch-fblogo (renamed from target/linux/patches/3.18.2/patch-fblogo) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/patch-yaffs2 (renamed from target/linux/patches/3.18.2/patch-yaffs2) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.18.2/ppc64-missing-zlib.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/relocs.patch (renamed from target/linux/patches/3.18.2/relocs.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/sgidefs.patch (renamed from target/linux/patches/3.18.2/sgidefs.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/sortext.patch (renamed from target/linux/patches/3.18.2/sortext.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/startup.patch (renamed from target/linux/patches/3.18.2/startup.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/wlan-cf.patch (renamed from target/linux/patches/3.18.2/wlan-cf.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.18.3/xargs.patch (renamed from target/linux/patches/3.18.2/xargs.patch) | 0 | ||||
| -rw-r--r-- | target/m68k/qemu-m68k/patches/3.18.3/m68k-coldfire-fec.patch (renamed from target/m68k/qemu-m68k/patches/3.18.2/m68k-coldfire-fec.patch) | 0 | ||||
| -rw-r--r-- | target/m68k/qemu-m68k/patches/3.18.3/qemu-coldfire.patch (renamed from target/m68k/qemu-m68k/patches/3.18.2/qemu-coldfire.patch) | 0 | ||||
| -rw-r--r-- | target/mips64/lemote-yeelong/patches/3.18.3/sm7xx-fb.patch (renamed from target/mips64/lemote-yeelong/patches/3.18.2/sm7xx-fb.patch) | 0 |
29 files changed, 1436 insertions, 1956 deletions
diff --git a/target/arm/raspberry-pi/patches/3.18.2/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.18.3/raspberry-pi.patch index 6fb100f30..4543ea066 100644 --- a/target/arm/raspberry-pi/patches/3.18.2/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.18.3/raspberry-pi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi ---- linux-3.18.1/arch/arm/boot/dts/bcm2708.dtsi 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-01-09 13:30:02.180124919 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708.dtsi +--- linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708.dtsi 2015-01-19 14:30:16.166226125 +0100 @@ -0,0 +1,110 @@ +/include/ "skeleton.dtsi" + @@ -112,9 +112,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dt + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts ---- linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-01-09 13:30:02.180124919 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b.dts +--- linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-01-19 14:30:16.166226125 +0100 @@ -0,0 +1,101 @@ +/dts-v1/; + @@ -217,9 +217,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/bo + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ---- linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-01-09 13:30:02.180124919 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +--- linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-01-19 14:30:16.166226125 +0100 @@ -0,0 +1,101 @@ +/dts-v1/; + @@ -322,9 +322,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/a + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-01-09 13:30:02.188124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dac-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-01-19 14:30:16.170226125 +0100 @@ -0,0 +1,34 @@ +// Definitions for HiFiBerry DAC +/dts-v1/; @@ -360,9 +360,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arc + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-01-09 13:30:02.188124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-01-19 14:30:16.170226125 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry DAC+ +/dts-v1/; @@ -403,9 +403,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-01-09 13:30:02.188124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-digi-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-01-19 14:30:16.170226125 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Digi +/dts-v1/; @@ -446,9 +446,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/ar + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-01-09 13:30:02.200124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dac-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-01-19 14:30:16.178226125 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC +/dts-v1/; @@ -489,9 +489,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/ + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-01-09 13:30:02.200124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-01-19 14:30:16.178226125 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC+ +/dts-v1/; @@ -532,9 +532,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/a + }; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts ---- linux-3.18.1/arch/arm/boot/dts/lirc-rpi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-01-09 13:30:02.204124917 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/lirc-rpi-overlay.dts +--- linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-01-19 14:30:16.182226125 +0100 @@ -0,0 +1,57 @@ +// Definitions for lirc-rpi module +/dts-v1/; @@ -593,9 +593,9 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm + debug = <&lirc_rpi>,"rpi,debug:0"; + }; +}; -diff -Nur linux-3.18.1/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile ---- linux-3.18.1/arch/arm/boot/dts/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/boot/dts/Makefile 2015-01-09 13:30:02.172124919 -0600 +diff -Nur linux-3.18.3/arch/arm/boot/dts/Makefile linux-rpi-3.18.x/arch/arm/boot/dts/Makefile +--- linux-3.18.3/arch/arm/boot/dts/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/boot/dts/Makefile 2015-01-19 14:30:16.162226125 +0100 @@ -53,6 +53,8 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb @@ -613,10 +613,10 @@ diff -Nur linux-3.18.1/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Ma endif # *.dtb used to be generated in the directory above. Clean out the -diff -Nur linux-3.18.1/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.18.1/arch/arm/configs/bcmrpi_defconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2015-01-09 13:30:02.232124918 -0600 -@@ -0,0 +1,1120 @@ +diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/arm/configs/bcmrpi_defconfig +--- linux-3.18.3/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/configs/bcmrpi_defconfig 2015-01-19 14:30:16.198226124 +0100 +@@ -0,0 +1,1123 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 +# CONFIG_LOCALVERSION_AUTO is not set @@ -1056,8 +1056,11 @@ diff -Nur linux-3.18.1/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/conf +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m ++CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m ++CONFIG_USB_NET_SR9700=m ++CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=m @@ -1737,9 +1740,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.18.1/arch/arm/configs/bcmrpi_quick_defconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2015-01-09 13:30:02.232124918 -0600 +diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.18.x/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/configs/bcmrpi_quick_defconfig 2015-01-19 14:30:16.198226124 +0100 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -1938,9 +1941,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/include/asm/dma-mapping.h ---- linux-3.18.1/arch/arm/include/asm/dma-mapping.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/include/asm/dma-mapping.h 2015-01-09 13:30:02.240124918 -0600 +diff -Nur linux-3.18.3/arch/arm/include/asm/dma-mapping.h linux-rpi-3.18.x/arch/arm/include/asm/dma-mapping.h +--- linux-3.18.3/arch/arm/include/asm/dma-mapping.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/include/asm/dma-mapping.h 2015-01-19 14:30:16.206226124 +0100 @@ -58,37 +58,21 @@ #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) @@ -1980,9 +1983,9 @@ diff -Nur linux-3.18.1/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/inc return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); } -diff -Nur linux-3.18.1/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h ---- linux-3.18.1/arch/arm/include/asm/irqflags.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/include/asm/irqflags.h 2015-01-09 12:27:20.304159359 -0600 +diff -Nur linux-3.18.3/arch/arm/include/asm/irqflags.h linux-rpi-3.18.x/arch/arm/include/asm/irqflags.h +--- linux-3.18.3/arch/arm/include/asm/irqflags.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/include/asm/irqflags.h 2015-01-19 14:27:12.494231582 +0100 @@ -145,12 +145,22 @@ } @@ -2009,9 +2012,9 @@ diff -Nur linux-3.18.1/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/includ : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.18.1/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h ---- linux-3.18.1/arch/arm/include/asm/string.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/include/asm/string.h 2015-01-09 12:27:20.308159360 -0600 +diff -Nur linux-3.18.3/arch/arm/include/asm/string.h linux-rpi-3.18.x/arch/arm/include/asm/string.h +--- linux-3.18.3/arch/arm/include/asm/string.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/include/asm/string.h 2015-01-19 14:27:12.498231582 +0100 @@ -24,6 +24,11 @@ #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -2024,9 +2027,9 @@ diff -Nur linux-3.18.1/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/ extern void __memzero(void *ptr, __kernel_size_t n); #define memset(p,v,n) \ -diff -Nur linux-3.18.1/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h ---- linux-3.18.1/arch/arm/include/asm/uaccess.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/include/asm/uaccess.h 2015-01-09 13:30:02.244124918 -0600 +diff -Nur linux-3.18.3/arch/arm/include/asm/uaccess.h linux-rpi-3.18.x/arch/arm/include/asm/uaccess.h +--- linux-3.18.3/arch/arm/include/asm/uaccess.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/include/asm/uaccess.h 2015-01-19 14:30:16.210226124 +0100 @@ -475,6 +475,7 @@ #ifdef CONFIG_MMU @@ -2035,9 +2038,9 @@ diff -Nur linux-3.18.1/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n); -diff -Nur linux-3.18.1/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-3.18.1/arch/arm/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/Kconfig 2015-01-09 13:30:02.172124919 -0600 +diff -Nur linux-3.18.3/arch/arm/Kconfig linux-rpi-3.18.x/arch/arm/Kconfig +--- linux-3.18.3/arch/arm/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/Kconfig 2015-01-19 14:30:16.158226125 +0100 @@ -381,6 +381,23 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -2070,9 +2073,9 @@ diff -Nur linux-3.18.1/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.18.1/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-3.18.1/arch/arm/Kconfig.debug 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/Kconfig.debug 2015-01-09 13:30:02.172124919 -0600 +diff -Nur linux-3.18.3/arch/arm/Kconfig.debug linux-rpi-3.18.x/arch/arm/Kconfig.debug +--- linux-3.18.3/arch/arm/Kconfig.debug 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/Kconfig.debug 2015-01-19 14:30:16.158226125 +0100 @@ -985,6 +985,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -2088,9 +2091,9 @@ diff -Nur linux-3.18.1/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.18.1/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-3.18.1/arch/arm/kernel/fiqasm.S 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2015-01-09 13:30:02.248124918 -0600 +diff -Nur linux-3.18.3/arch/arm/kernel/fiqasm.S linux-rpi-3.18.x/arch/arm/kernel/fiqasm.S +--- linux-3.18.3/arch/arm/kernel/fiqasm.S 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/kernel/fiqasm.S 2015-01-19 14:30:16.210226124 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 ret lr @@ -2099,9 +2102,9 @@ diff -Nur linux-3.18.1/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.18.1/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c ---- linux-3.18.1/arch/arm/kernel/process.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/kernel/process.c 2015-01-09 13:30:02.252124918 -0600 +diff -Nur linux-3.18.3/arch/arm/kernel/process.c linux-rpi-3.18.x/arch/arm/kernel/process.c +--- linux-3.18.3/arch/arm/kernel/process.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/kernel/process.c 2015-01-19 14:30:16.214226124 +0100 @@ -166,6 +166,16 @@ } #endif @@ -2119,9 +2122,9 @@ diff -Nur linux-3.18.1/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proce /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.18.1/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h ---- linux-3.18.1/arch/arm/lib/arm-mem.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/arm-mem.h 2015-01-09 12:27:20.320159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/arm-mem.h linux-rpi-3.18.x/arch/arm/lib/arm-mem.h +--- linux-3.18.3/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/arm-mem.h 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,159 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -2282,9 +2285,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h + .endif +92: +.endm -diff -Nur linux-3.18.1/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy_from_user.S ---- linux-3.18.1/arch/arm/lib/copy_from_user.S 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/lib/copy_from_user.S 2015-01-09 12:27:20.320159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/copy_from_user.S linux-rpi-3.18.x/arch/arm/lib/copy_from_user.S +--- linux-3.18.3/arch/arm/lib/copy_from_user.S 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/copy_from_user.S 2015-01-19 14:27:12.506231582 +0100 @@ -84,11 +84,13 @@ .text @@ -2300,9 +2303,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy .pushsection .fixup,"ax" .align 0 -diff -Nur linux-3.18.1/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports_rpi.c ---- linux-3.18.1/arch/arm/lib/exports_rpi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/exports_rpi.c 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/exports_rpi.c linux-rpi-3.18.x/arch/arm/lib/exports_rpi.c +--- linux-3.18.3/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/exports_rpi.c 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2014, Raspberry Pi (Trading) Ltd. @@ -2341,9 +2344,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports +#include <linux/module.h> + +EXPORT_SYMBOL(memcmp); -diff -Nur linux-3.18.1/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile ---- linux-3.18.1/arch/arm/lib/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/lib/Makefile 2015-01-09 13:30:02.256124918 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/Makefile linux-rpi-3.18.x/arch/arm/lib/Makefile +--- linux-3.18.3/arch/arm/lib/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/Makefile 2015-01-19 14:30:16.218226124 +0100 @@ -6,15 +6,24 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ @@ -2372,9 +2375,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile mmu-y := clear_user.o copy_page.o getuser.o putuser.o # the code in uaccess.S is not preemption safe and -diff -Nur linux-3.18.1/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_rpi.S ---- linux-3.18.1/arch/arm/lib/memcmp_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/memcmp_rpi.S 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/memcmp_rpi.S linux-rpi-3.18.x/arch/arm/lib/memcmp_rpi.S +--- linux-3.18.3/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/memcmp_rpi.S 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,285 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -2661,9 +2664,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_r + .unreq DAT7 + .unreq OFF +ENDPROC(memcmp) -diff -Nur linux-3.18.1/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymove.h ---- linux-3.18.1/arch/arm/lib/memcpymove.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/memcpymove.h 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/memcpymove.h linux-rpi-3.18.x/arch/arm/lib/memcpymove.h +--- linux-3.18.3/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/memcpymove.h 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,506 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -3171,9 +3174,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymo + .unreq LAST + .unreq OFF +.endm -diff -Nur linux-3.18.1/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_rpi.S ---- linux-3.18.1/arch/arm/lib/memcpy_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/memcpy_rpi.S 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/memcpy_rpi.S linux-rpi-3.18.x/arch/arm/lib/memcpy_rpi.S +--- linux-3.18.3/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/memcpy_rpi.S 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,59 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -3234,9 +3237,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_r +ENTRY(memcpy) + memcpy 0 +ENDPROC(memcpy) -diff -Nur linux-3.18.1/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove_rpi.S ---- linux-3.18.1/arch/arm/lib/memmove_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/memmove_rpi.S 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/memmove_rpi.S linux-rpi-3.18.x/arch/arm/lib/memmove_rpi.S +--- linux-3.18.3/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/memmove_rpi.S 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,61 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -3299,9 +3302,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove + bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */ + memcpy 1 +ENDPROC(memmove) -diff -Nur linux-3.18.1/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_rpi.S ---- linux-3.18.1/arch/arm/lib/memset_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/lib/memset_rpi.S 2015-01-09 12:27:20.324159360 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/memset_rpi.S linux-rpi-3.18.x/arch/arm/lib/memset_rpi.S +--- linux-3.18.3/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/memset_rpi.S 2015-01-19 14:27:12.506231582 +0100 @@ -0,0 +1,121 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -3424,9 +3427,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_r + .unreq DAT2 + .unreq DAT3 +ENDPROC(memset) -diff -Nur linux-3.18.1/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib/uaccess_with_memcpy.c ---- linux-3.18.1/arch/arm/lib/uaccess_with_memcpy.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/lib/uaccess_with_memcpy.c 2015-01-09 13:30:02.260124918 -0600 +diff -Nur linux-3.18.3/arch/arm/lib/uaccess_with_memcpy.c linux-rpi-3.18.x/arch/arm/lib/uaccess_with_memcpy.c +--- linux-3.18.3/arch/arm/lib/uaccess_with_memcpy.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/lib/uaccess_with_memcpy.c 2015-01-19 14:30:16.218226124 +0100 @@ -22,6 +22,14 @@ #include <asm/current.h> #include <asm/page.h> @@ -3570,9 +3573,9 @@ diff -Nur linux-3.18.1/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.18.1/arch/arm/mach-bcm2708/armctrl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.18.3/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/armctrl.c 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,315 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -3889,9 +3892,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-b + armctrl_dt_init(); + return 0; +} -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.18.1/arch/arm/mach-bcm2708/armctrl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.18.3/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/armctrl.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -3920,9 +3923,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.18.1/arch/arm/mach-bcm2708/bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708.c 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,1095 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -5019,10 +5022,10 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-01-09 13:30:02.268124918 -0600 -@@ -0,0 +1,402 @@ +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.18.3/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-01-19 14:30:16.226226123 +0100 +@@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c + * @@ -5068,6 +5071,8 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m +#define GPIOUD(x) (0x94+(x)*4) +#define GPIOUDCLK(x) (0x98+(x)*4) + ++#define GPIO_BANKS 2 ++ +enum { GPIO_FSEL_INPUT, GPIO_FSEL_OUTPUT, + GPIO_FSEL_ALT5, GPIO_FSEL_ALT_4, + GPIO_FSEL_ALT0, GPIO_FSEL_ALT1, @@ -5264,8 +5269,6 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + unsigned long high = readl(gpio->base + GPIOHEN(gb)); + unsigned long low = readl(gpio->base + GPIOLEN(gb)); + -+ writel(1 << go, gpio->base + GPIOEDS(gb)); -+ + if (gpio->rising[gb] & (1 << go)) { + writel(rising | (1 << go), gpio->base + GPIOREN(gb)); + } else { @@ -5306,12 +5309,24 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + unsigned bank; + int i; + unsigned gpio; -+ for (bank = 0; bank <= 1; bank++) { ++ unsigned level_bits; ++ struct bcm2708_gpio *gpio_data = dev_id; ++ ++ for (bank = 0; bank < GPIO_BANKS; bank++) { + edsr = readl(__io_address(GPIO_BASE) + GPIOEDS(bank)); ++ level_bits = gpio_data->high[bank] | gpio_data->low[bank]; ++ + for_each_set_bit(i, &edsr, 32) { + gpio = i + bank * 32; ++ /* ack edge triggered IRQs immediately */ ++ if (!(level_bits & (1<<i))) ++ writel(1<<i, ++ __io_address(GPIO_BASE) + GPIOEDS(bank)); + generic_handle_irq(gpio_to_irq(gpio)); -+ writel(1<<i,__io_address(GPIO_BASE) + GPIOEDS(bank)); ++ /* ack level triggered IRQ after handling them */ ++ if (level_bits & (1<<i)) ++ writel(1<<i, ++ __io_address(GPIO_BASE) + GPIOEDS(bank)); + } + } + return IRQ_HANDLED; @@ -5331,9 +5346,12 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + + for (irq = GPIO_IRQ_START; irq < (GPIO_IRQ_START + GPIO_IRQS); irq++) { + irq_set_chip_data(irq, ucb); -+ irq_set_chip(irq, &bcm2708_irqchip); ++ irq_set_chip_and_handler(irq, &bcm2708_irqchip, ++ handle_simple_irq); + set_irq_flags(irq, IRQF_VALID); + } ++ ++ bcm2708_gpio_irq.dev_id = ucb; + setup_irq(IRQ_GPIO3, &bcm2708_gpio_irq); +} + @@ -5349,6 +5367,7 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m +{ + struct bcm2708_gpio *ucb; + struct resource *res; ++ int bank; + int err = 0; + + printk(KERN_INFO DRIVER_NAME ": bcm2708_gpio_probe %p\n", dev); @@ -5377,11 +5396,19 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + ucb->gc.set = bcm2708_gpio_set; + ucb->gc.can_sleep = 0; + ++ for (bank = 0; bank < GPIO_BANKS; bank++) { ++ writel(0, ucb->base + GPIOREN(bank)); ++ writel(0, ucb->base + GPIOFEN(bank)); ++ writel(0, ucb->base + GPIOHEN(bank)); ++ writel(0, ucb->base + GPIOLEN(bank)); ++ writel(0, ucb->base + GPIOAREN(bank)); ++ writel(0, ucb->base + GPIOAFEN(bank)); ++ writel(~0, ucb->base + GPIOEDS(bank)); ++ } ++ + bcm2708_gpio_irq_init(ucb); + + err = gpiochip_add(&ucb->gc); -+ if (err) -+ goto err; + +err: + return err; @@ -5425,9 +5452,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.18.1/arch/arm/mach-bcm2708/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/bcm2708.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -5478,9 +5505,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c ---- linux-3.18.1/arch/arm/mach-bcm2708/dma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/dma.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/dma.c +--- linux-3.18.3/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/dma.c 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,409 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -5891,9 +5918,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/arm_control.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/arm_control.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -6314,9 +6341,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rp +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/arm_power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,62 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -6380,9 +6407,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/ +}; + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/clkdev.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/clkdev.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -6391,9 +6418,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -6417,9 +6444,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/dma.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/dma.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,94 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6515,9 +6542,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/a + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6588,9 +6615,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/frc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/frc.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6630,9 +6657,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/gpio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/gpio.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6651,9 +6678,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/hardware.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/hardware.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6683,9 +6710,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/a +#include <mach/platform.h> + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/io.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/io.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6714,9 +6741,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/irqs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/irqs.h 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6917,9 +6944,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/memory.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/memory.h 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6978,9 +7005,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/platform.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/platform.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -7210,9 +7237,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/power.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -7240,9 +7267,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/system.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/system.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -7282,9 +7309,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/timex.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/timex.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -7309,9 +7336,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/uncompress.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/uncompress.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -7397,9 +7424,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vcio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7566,9 +7593,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/ +#define DEVICE_FILE_NAME "vcio" + +#endif -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7605,9 +7632,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arc +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,181 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -7790,9 +7817,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi +} VC_SM_MSG_UNION_T; + +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,55 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -7849,9 +7876,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi/ + long unsigned int *data); + +#endif /* __VC_SM_KNL_H__INCLUDED__ */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,82 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -7935,9 +7962,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi + VC_SM_ACTION_CLEAN_T *action_clean); + +#endif /* __VC_VCHI_SM_H__INCLUDED__ */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7959,9 +7986,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h ---- linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h +--- linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,233 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -8196,9 +8223,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux- +/* ---- Function Prototypes ---------------------------------------------- */ + +#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */ -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig ---- linux-3.18.1/arch/arm/mach-bcm2708/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.18.x/arch/arm/mach-bcm2708/Kconfig +--- linux-3.18.3/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/Kconfig 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,52 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -8252,9 +8279,9 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile ---- linux-3.18.1/arch/arm/mach-bcm2708/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/Makefile linux-rpi-3.18.x/arch/arm/mach-bcm2708/Makefile +--- linux-3.18.3/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/Makefile 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -8263,16 +8290,16 @@ diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bc +obj-$(CONFIG_MACH_BCM2708) += 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.18.1/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.18.1/arch/arm/mach-bcm2708/Makefile.boot 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.18.x/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.18.3/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/Makefile.boot 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.18.1/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c ---- linux-3.18.1/arch/arm/mach-bcm2708/power.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/power.c 2015-01-09 13:30:02.268124918 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/power.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/power.c +--- linux-3.18.3/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/power.c 2015-01-19 14:30:16.226226123 +0100 @@ -0,0 +1,197 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -8471,9 +8498,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c ---- linux-3.18.1/arch/arm/mach-bcm2708/vcio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/vcio.c +--- linux-3.18.3/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/vcio.c 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -8949,9 +8976,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.18.1/arch/arm/mach-bcm2708/vc_mem.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c 2015-01-09 12:27:20.336159360 -0600 +diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.18.x/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.18.3/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mach-bcm2708/vc_mem.c 2015-01-19 14:27:12.514231581 +0100 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -9385,9 +9412,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/Makefile linux-rpi/arch/arm/Makefile ---- linux-3.18.1/arch/arm/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/Makefile 2015-01-09 13:30:02.172124919 -0600 +diff -Nur linux-3.18.3/arch/arm/Makefile linux-rpi-3.18.x/arch/arm/Makefile +--- linux-3.18.3/arch/arm/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/Makefile 2015-01-19 14:30:16.158226125 +0100 @@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia @@ -9396,9 +9423,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig ---- linux-3.18.1/arch/arm/mm/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/mm/Kconfig 2015-01-09 13:30:02.360124917 -0600 +diff -Nur linux-3.18.3/arch/arm/mm/Kconfig linux-rpi-3.18.x/arch/arm/mm/Kconfig +--- linux-3.18.3/arch/arm/mm/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mm/Kconfig 2015-01-19 14:30:16.286226122 +0100 @@ -358,7 +358,7 @@ # ARMv6 @@ -9408,9 +9435,9 @@ diff -Nur linux-3.18.1/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.18.1/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ---- linux-3.18.1/arch/arm/mm/proc-v6.S 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/mm/proc-v6.S 2015-01-09 13:30:02.364124917 -0600 +diff -Nur linux-3.18.3/arch/arm/mm/proc-v6.S linux-rpi-3.18.x/arch/arm/mm/proc-v6.S +--- linux-3.18.3/arch/arm/mm/proc-v6.S 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/mm/proc-v6.S 2015-01-19 14:30:16.286226122 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -9434,9 +9461,9 @@ diff -Nur linux-3.18.1/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ret lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.18.1/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types ---- linux-3.18.1/arch/arm/tools/mach-types 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/arch/arm/tools/mach-types 2015-01-09 12:27:20.512159357 -0600 +diff -Nur linux-3.18.3/arch/arm/tools/mach-types linux-rpi-3.18.x/arch/arm/tools/mach-types +--- linux-3.18.3/arch/arm/tools/mach-types 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/arch/arm/tools/mach-types 2015-01-19 14:27:12.626231578 +0100 @@ -522,6 +522,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -9445,9 +9472,9 @@ diff -Nur linux-3.18.1/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.18.1/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-3.18.1/Documentation/video4linux/bcm2835-v4l2.txt 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2015-01-09 12:27:20.204159361 -0600 +diff -Nur linux-3.18.3/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi-3.18.x/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-3.18.3/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/Documentation/video4linux/bcm2835-v4l2.txt 2015-01-19 14:27:12.426231584 +0100 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -9509,9 +9536,9 @@ diff -Nur linux-3.18.1/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Docu +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-3.18.1/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig ---- linux-3.18.1/drivers/char/broadcom/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/Kconfig 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/Kconfig linux-rpi-3.18.x/drivers/char/broadcom/Kconfig +--- linux-3.18.3/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/Kconfig 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,22 @@ +# +# Broadcom char driver config @@ -9535,15 +9562,15 @@ diff -Nur linux-3.18.1/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broa + help + Support for the VC shared memory on the Broadcom reference + design. Uses the VCHIQ stack. -diff -Nur linux-3.18.1/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile ---- linux-3.18.1/drivers/char/broadcom/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/Makefile 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/Makefile linux-rpi-3.18.x/drivers/char/broadcom/Makefile +--- linux-3.18.3/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/Makefile 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ +obj-$(CONFIG_BCM_VC_SM) += vc_sm/ -diff -Nur linux-3.18.1/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.18.1/drivers/char/broadcom/vc_cma/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.18.x/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.18.3/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/vc_cma/Makefile 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,14 @@ +ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs +ccflags-y += -Werror @@ -9559,9 +9586,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.18.1/drivers/char/broadcom/vc_cma/vc_cma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.18.x/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-3.18.3/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/vc_cma/vc_cma.c 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,1143 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10706,9 +10733,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/char/broadcom/vc_sm/Makefile ---- linux-3.18.1/drivers/char/broadcom/vc_sm/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/vc_sm/Makefile 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/Makefile linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/Makefile +--- linux-3.18.3/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/Makefile 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,21 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 + @@ -10731,9 +10758,9 @@ diff -Nur linux-3.18.1/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/ch +vc-sm-objs := \ + vmcs_sm.o \ + vc_vchi_sm.o -diff -Nur linux-3.18.1/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c ---- linux-3.18.1/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/vc_vchi_sm.c +--- linux-3.18.3/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2015-01-19 14:27:13.250231560 +0100 @@ -0,0 +1,492 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -11227,9 +11254,9 @@ diff -Nur linux-3.18.1/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/driver + return vc_vchi_sm_send_msg(handle, VC_SM_MSG_TYPE_ACTION_CLEAN, + msg, sizeof(*msg), 0, 0, 0, 0); +} -diff -Nur linux-3.18.1/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c ---- linux-3.18.1/drivers/char/broadcom/vc_sm/vmcs_sm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c 2015-01-09 12:27:21.652159348 -0600 +diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/vmcs_sm.c +--- linux-3.18.3/drivers/char/broadcom/vc_sm/vmcs_sm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/broadcom/vc_sm/vmcs_sm.c 2015-01-19 14:27:13.254231559 +0100 @@ -0,0 +1,3163 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -14394,9 +14421,9 @@ diff -Nur linux-3.18.1/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/c +MODULE_AUTHOR("Broadcom"); +MODULE_DESCRIPTION("VideoCore SharedMemory Driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.1/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c ---- linux-3.18.1/drivers/char/hw_random/bcm2708-rng.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2015-01-09 13:30:02.916124912 -0600 +diff -Nur linux-3.18.3/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.18.x/drivers/char/hw_random/bcm2708-rng.c +--- linux-3.18.3/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/hw_random/bcm2708-rng.c 2015-01-19 14:30:16.634226111 +0100 @@ -0,0 +1,118 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -14516,9 +14543,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig ---- linux-3.18.1/drivers/char/hw_random/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/char/hw_random/Kconfig 2015-01-09 13:30:02.916124912 -0600 +diff -Nur linux-3.18.3/drivers/char/hw_random/Kconfig linux-rpi-3.18.x/drivers/char/hw_random/Kconfig +--- linux-3.18.3/drivers/char/hw_random/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/hw_random/Kconfig 2015-01-19 14:30:16.634226111 +0100 @@ -320,6 +320,17 @@ If unsure, say Y. @@ -14537,9 +14564,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile ---- linux-3.18.1/drivers/char/hw_random/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/char/hw_random/Makefile 2015-01-09 13:30:02.916124912 -0600 +diff -Nur linux-3.18.3/drivers/char/hw_random/Makefile linux-rpi-3.18.x/drivers/char/hw_random/Makefile +--- linux-3.18.3/drivers/char/hw_random/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/hw_random/Makefile 2015-01-19 14:30:16.634226111 +0100 @@ -28,5 +28,6 @@ obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o @@ -14547,9 +14574,9 @@ diff -Nur linux-3.18.1/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o -diff -Nur linux-3.18.1/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig ---- linux-3.18.1/drivers/char/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/char/Kconfig 2015-01-09 13:30:02.912124912 -0600 +diff -Nur linux-3.18.3/drivers/char/Kconfig linux-rpi-3.18.x/drivers/char/Kconfig +--- linux-3.18.3/drivers/char/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/Kconfig 2015-01-19 14:30:16.630226111 +0100 @@ -581,6 +581,8 @@ source "drivers/s390/char/Kconfig" @@ -14559,17 +14586,17 @@ diff -Nur linux-3.18.1/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.18.1/drivers/char/Makefile linux-rpi/drivers/char/Makefile ---- linux-3.18.1/drivers/char/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/char/Makefile 2015-01-09 13:30:02.912124912 -0600 +diff -Nur linux-3.18.3/drivers/char/Makefile linux-rpi-3.18.x/drivers/char/Makefile +--- linux-3.18.3/drivers/char/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/char/Makefile 2015-01-19 14:30:16.630226111 +0100 @@ -62,3 +62,4 @@ obj-$(CONFIG_TILE_SROM) += tile-srom.o obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ -diff -Nur linux-3.18.1/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-3.18.1/drivers/cpufreq/bcm2835-cpufreq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2015-01-09 13:30:02.956124910 -0600 +diff -Nur linux-3.18.3/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.18.x/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-3.18.3/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/cpufreq/bcm2835-cpufreq.c 2015-01-19 14:30:16.662226110 +0100 @@ -0,0 +1,224 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -14795,9 +14822,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm ---- linux-3.18.1/drivers/cpufreq/Kconfig.arm 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/cpufreq/Kconfig.arm 2015-01-09 13:30:02.956124910 -0600 +diff -Nur linux-3.18.3/drivers/cpufreq/Kconfig.arm linux-rpi-3.18.x/drivers/cpufreq/Kconfig.arm +--- linux-3.18.3/drivers/cpufreq/Kconfig.arm 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/cpufreq/Kconfig.arm 2015-01-19 14:30:16.662226110 +0100 @@ -241,6 +241,14 @@ help This adds the CPUFreq driver support for SPEAr SOCs. @@ -14813,9 +14840,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile ---- linux-3.18.1/drivers/cpufreq/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/cpufreq/Makefile 2015-01-09 13:30:02.956124910 -0600 +diff -Nur linux-3.18.3/drivers/cpufreq/Makefile linux-rpi-3.18.x/drivers/cpufreq/Makefile +--- linux-3.18.3/drivers/cpufreq/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/cpufreq/Makefile 2015-01-19 14:30:16.662226110 +0100 @@ -75,6 +75,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o @@ -14824,9 +14851,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c ---- linux-3.18.1/drivers/dma/bcm2708-dmaengine.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2015-01-09 13:30:02.980124910 -0600 +diff -Nur linux-3.18.3/drivers/dma/bcm2708-dmaengine.c linux-rpi-3.18.x/drivers/dma/bcm2708-dmaengine.c +--- linux-3.18.3/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/dma/bcm2708-dmaengine.c 2015-01-19 14:30:16.678226110 +0100 @@ -0,0 +1,1052 @@ +/* + * BCM2835 DMA engine support @@ -14959,7 +14986,7 @@ diff -Nur linux-3.18.1/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm +#define BCM2835_DMA_PER_MAP(x) ((x) << 16) +#define BCM2835_DMA_WAITS(x) (((x)&0x1f) << 21) + -+#define SDHCI_BCM_DMA_WAITS 20 /* delays slowing DMA transfers: 0-31 */ ++#define SDHCI_BCM_DMA_WAITS 0 /* delays slowing DMA transfers: 0-31 */ + +#define BCM2835_DMA_DATA_TYPE_S8 1 +#define BCM2835_DMA_DATA_TYPE_S16 2 @@ -15880,9 +15907,9 @@ diff -Nur linux-3.18.1/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_AUTHOR("Gellert Weisz <gellert@raspberrypi.org>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.1/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig ---- linux-3.18.1/drivers/dma/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/dma/Kconfig 2015-01-09 13:30:02.980124910 -0600 +diff -Nur linux-3.18.3/drivers/dma/Kconfig linux-rpi-3.18.x/drivers/dma/Kconfig +--- linux-3.18.3/drivers/dma/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/dma/Kconfig 2015-01-19 14:30:16.678226110 +0100 @@ -330,6 +330,12 @@ select DMA_ENGINE select DMA_VIRTUAL_CHANNELS @@ -15896,9 +15923,9 @@ diff -Nur linux-3.18.1/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig config TI_CPPI41 tristate "AM33xx CPPI41 DMA support" depends on ARCH_OMAP -diff -Nur linux-3.18.1/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile ---- linux-3.18.1/drivers/dma/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/dma/Makefile 2015-01-09 13:30:02.980124910 -0600 +diff -Nur linux-3.18.3/drivers/dma/Makefile linux-rpi-3.18.x/drivers/dma/Makefile +--- linux-3.18.3/drivers/dma/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/dma/Makefile 2015-01-19 14:30:16.678226110 +0100 @@ -38,6 +38,7 @@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o @@ -15907,9 +15934,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhid/hid-core.c ---- linux-3.18.1/drivers/hid/usbhid/hid-core.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/hid/usbhid/hid-core.c 2015-01-09 13:30:03.196124908 -0600 +diff -Nur linux-3.18.3/drivers/hid/usbhid/hid-core.c linux-rpi-3.18.x/drivers/hid/usbhid/hid-core.c +--- linux-3.18.3/drivers/hid/usbhid/hid-core.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/hid/usbhid/hid-core.c 2015-01-19 14:30:16.814226106 +0100 @@ -49,7 +49,7 @@ * Module parameters. */ @@ -15934,9 +15961,9 @@ diff -Nur linux-3.18.1/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhi ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -diff -Nur linux-3.18.1/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c ---- linux-3.18.1/drivers/hwmon/bcm2835-hwmon.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2015-01-09 12:27:21.924159344 -0600 +diff -Nur linux-3.18.3/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.18.x/drivers/hwmon/bcm2835-hwmon.c +--- linux-3.18.3/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/hwmon/bcm2835-hwmon.c 2015-01-19 14:27:13.426231554 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -16157,9 +16184,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig ---- linux-3.18.1/drivers/hwmon/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/hwmon/Kconfig 2015-01-09 13:30:03.200124908 -0600 +diff -Nur linux-3.18.3/drivers/hwmon/Kconfig linux-rpi-3.18.x/drivers/hwmon/Kconfig +--- linux-3.18.3/drivers/hwmon/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/hwmon/Kconfig 2015-01-19 14:30:16.818226106 +0100 @@ -1680,6 +1680,16 @@ This driver provides support for the Ultra45 workstation environmental sensors. @@ -16177,9 +16204,9 @@ diff -Nur linux-3.18.1/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig if ACPI comment "ACPI drivers" -diff -Nur linux-3.18.1/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile ---- linux-3.18.1/drivers/hwmon/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/hwmon/Makefile 2015-01-09 13:30:03.204124908 -0600 +diff -Nur linux-3.18.3/drivers/hwmon/Makefile linux-rpi-3.18.x/drivers/hwmon/Makefile +--- linux-3.18.3/drivers/hwmon/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/hwmon/Makefile 2015-01-19 14:30:16.818226106 +0100 @@ -153,6 +153,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -16188,9 +16215,9 @@ diff -Nur linux-3.18.1/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile obj-$(CONFIG_PMBUS) += pmbus/ -diff -Nur linux-3.18.1/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.18.1/drivers/i2c/busses/i2c-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2015-01-09 13:30:03.228124909 -0600 +diff -Nur linux-3.18.3/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.18.x/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.18.3/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/i2c/busses/i2c-bcm2708.c 2015-01-19 14:30:16.834226105 +0100 @@ -0,0 +1,473 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -16665,9 +16692,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig ---- linux-3.18.1/drivers/i2c/busses/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/i2c/busses/Kconfig 2015-01-09 13:30:03.228124909 -0600 +diff -Nur linux-3.18.3/drivers/i2c/busses/Kconfig linux-rpi-3.18.x/drivers/i2c/busses/Kconfig +--- linux-3.18.3/drivers/i2c/busses/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/i2c/busses/Kconfig 2015-01-19 14:30:16.834226105 +0100 @@ -361,7 +361,7 @@ config I2C_BCM2835 @@ -16703,9 +16730,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile ---- linux-3.18.1/drivers/i2c/busses/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/i2c/busses/Makefile 2015-01-09 13:30:03.228124909 -0600 +diff -Nur linux-3.18.3/drivers/i2c/busses/Makefile linux-rpi-3.18.x/drivers/i2c/busses/Makefile +--- linux-3.18.3/drivers/i2c/busses/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/i2c/busses/Makefile 2015-01-19 14:30:16.834226105 +0100 @@ -33,6 +33,7 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o @@ -16714,9 +16741,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c ---- linux-3.18.1/drivers/media/platform/bcm2835/bcm2835-camera.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-01-09 13:30:03.452124907 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi-3.18.x/drivers/media/platform/bcm2835/bcm2835-camera.c +--- linux-3.18.3/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-01-19 14:30:16.978226101 +0100 @@ -0,0 +1,1824 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -18542,9 +18569,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h ---- linux-3.18.1/drivers/media/platform/bcm2835/bcm2835-camera.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/bcm2835-camera.h +--- linux-3.18.3/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,126 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -18672,9 +18699,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c ---- linux-3.18.1/drivers/media/platform/bcm2835/controls.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/controls.c linux-rpi-3.18.x/drivers/media/platform/bcm2835/controls.c +--- linux-3.18.3/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/controls.c 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,1322 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -19998,9 +20025,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/controls.c linux-rpi/drive + + return 0; +} -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig ---- linux-3.18.1/drivers/media/platform/bcm2835/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/Kconfig linux-rpi-3.18.x/drivers/media/platform/bcm2835/Kconfig +--- linux-3.18.3/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/Kconfig 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,25 @@ +# Broadcom VideoCore IV v4l2 camera support + @@ -20027,18 +20054,18 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/ + + +endif # VIDEO_BM2835 -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile ---- linux-3.18.1/drivers/media/platform/bcm2835/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/Makefile linux-rpi-3.18.x/drivers/media/platform/bcm2835/Makefile +--- linux-3.18.3/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/Makefile 2015-01-19 14:27:13.662231547 +0100 @@ -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.18.1/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-common.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-common.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-common.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,53 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20093,9 +20120,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/dr + u32 v; +}; + -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-encodings.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-encodings.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-encodings.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,127 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20224,9 +20251,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi +/* @} MmalColorSpace List */ + +#endif /* MMAL_ENCODINGS_H */ -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-common.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-common.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,50 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20278,9 +20305,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rp +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-format.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-format.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-format.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,81 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20363,9 +20390,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rp +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,404 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20771,9 +20798,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drive + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-port.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-port.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-msg-port.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,107 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -20882,9 +20909,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/ + */ + +}; -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-parameters.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-parameters.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-parameters.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,656 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -21542,9 +21569,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-parameters.h linux-rp + u32 num_effect_params; + u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS]; +}; -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-vchiq.c +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,1916 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -23462,9 +23489,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/dri + kfree(instance); + return -ENODEV; +} -diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h ---- linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-01-09 12:27:22.324159342 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-vchiq.h +--- linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-01-19 14:27:13.662231547 +0100 @@ -0,0 +1,178 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -23644,9 +23671,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/dri + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ -diff -Nur linux-3.18.1/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig ---- linux-3.18.1/drivers/media/platform/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/media/platform/Kconfig 2015-01-09 13:30:03.452124907 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/Kconfig linux-rpi-3.18.x/drivers/media/platform/Kconfig +--- linux-3.18.3/drivers/media/platform/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/Kconfig 2015-01-19 14:30:16.978226101 +0100 @@ -126,6 +126,7 @@ source "drivers/media/platform/soc_camera/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" @@ -23655,9 +23682,9 @@ diff -Nur linux-3.18.1/drivers/media/platform/Kconfig linux-rpi/drivers/media/pl endif # V4L_PLATFORM_DRIVERS -diff -Nur linux-3.18.1/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile ---- linux-3.18.1/drivers/media/platform/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/media/platform/Makefile 2015-01-09 13:30:03.452124907 -0600 +diff -Nur linux-3.18.3/drivers/media/platform/Makefile linux-rpi-3.18.x/drivers/media/platform/Makefile +--- linux-3.18.3/drivers/media/platform/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/platform/Makefile 2015-01-19 14:30:16.978226101 +0100 @@ -49,4 +49,6 @@ obj-y += omap/ @@ -23665,9 +23692,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c ---- linux-3.18.1/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-01-09 13:30:03.516124905 -0600 +diff -Nur linux-3.18.3/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi-3.18.x/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +--- linux-3.18.3/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-01-19 14:30:17.018226100 +0100 @@ -1531,6 +1531,10 @@ &rtl2832u_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, @@ -23679,9 +23706,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig ---- linux-3.18.1/drivers/misc/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/misc/Kconfig 2015-01-09 13:30:03.580124906 -0600 +diff -Nur linux-3.18.3/drivers/misc/Kconfig linux-rpi-3.18.x/drivers/misc/Kconfig +--- linux-3.18.3/drivers/misc/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/Kconfig 2015-01-19 14:30:17.058226099 +0100 @@ -524,6 +524,7 @@ source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/mei/Kconfig" @@ -23690,9 +23717,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile ---- linux-3.18.1/drivers/misc/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/misc/Makefile 2015-01-09 13:30:03.580124906 -0600 +diff -Nur linux-3.18.3/drivers/misc/Makefile linux-rpi-3.18.x/drivers/misc/Makefile +--- linux-3.18.3/drivers/misc/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/Makefile 2015-01-19 14:30:17.058226099 +0100 @@ -51,6 +51,7 @@ obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o @@ -23701,9 +23728,9 @@ diff -Nur linux-3.18.1/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile obj-y += mic/ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24033,9 +24060,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24241,9 +24268,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24469,9 +24496,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24544,9 +24571,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,174 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24722,9 +24749,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,378 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -25104,9 +25131,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -25150,9 +25177,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,562 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -25716,9 +25743,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -25762,9 +25789,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2015-01-09 13:30:03.596124906 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2015-01-19 14:30:17.070226098 +0100 @@ -0,0 +1,2884 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -28650,9 +28677,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,223 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -28877,9 +28904,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -28918,9 +28945,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2010-2014 Broadcom. All rights reserved. @@ -28988,9 +29015,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29112,9 +29139,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + mutex_unlock(&g_connected_mutex); +} +EXPORT_SYMBOL(vchiq_add_connected_callback); -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -29166,9 +29193,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn +void vchiq_call_connected_callbacks(void); + +#endif /* VCHIQ_CONNECTED_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,3862 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33032,9 +33059,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,711 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33747,9 +33774,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,383 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -34134,9 +34161,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu +} + +#endif /* CONFIG_DEBUG_FS */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -34190,9 +34217,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu +void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance); + +#endif /* VCHIQ_DEBUGFS_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -34281,9 +34308,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv + return vchiq_build_time; +} +EOF -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34325,9 +34352,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li +#include "vchiq_util.h" + +#endif -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34518,9 +34545,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h + short *peer_version); + +#endif /* VCHIQ_IF_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34653,9 +34680,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 17 + +#endif -diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,458 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35115,9 +35142,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35188,9 +35215,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kill +#define mutex_lock_interruptible mutex_lock_interruptible_killable + +#endif -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35263,9 +35290,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35325,9 +35352,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,857 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -36186,9 +36213,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -36342,9 +36369,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -36427,9 +36454,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c ---- linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2015-01-09 12:27:22.488159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -36490,9 +36517,9 @@ diff -Nur linux-3.18.1/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Nur linux-3.18.1/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig ---- linux-3.18.1/drivers/misc/vc04_services/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/Kconfig 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/Kconfig linux-rpi-3.18.x/drivers/misc/vc04_services/Kconfig +--- linux-3.18.3/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/Kconfig 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,9 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -36503,9 +36530,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile ---- linux-3.18.1/drivers/misc/vc04_services/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/misc/vc04_services/Makefile 2015-01-09 12:27:22.484159339 -0600 +diff -Nur linux-3.18.3/drivers/misc/vc04_services/Makefile linux-rpi-3.18.x/drivers/misc/vc04_services/Makefile +--- linux-3.18.3/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/misc/vc04_services/Makefile 2015-01-19 14:27:13.778231544 +0100 @@ -0,0 +1,17 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -36524,10 +36551,23 @@ diff -Nur linux-3.18.1/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.18.1/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host/bcm2835-mmc.c ---- linux-3.18.1/drivers/mmc/host/bcm2835-mmc.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/mmc/host/bcm2835-mmc.c 2015-01-09 13:30:03.604124905 -0600 -@@ -0,0 +1,1547 @@ +diff -Nur linux-3.18.3/drivers/mmc/core/quirks.c linux-rpi-3.18.x/drivers/mmc/core/quirks.c +--- linux-3.18.3/drivers/mmc/core/quirks.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/mmc/core/quirks.c 2015-01-19 14:30:17.074226098 +0100 +@@ -95,5 +95,9 @@ + f->vendor_fixup(card, f->data); + } + } ++ /* SDHCI on BCM2708 - bug causes a certain sequence of CMD23 operations to fail. ++ * Disable this flag for all cards (fall-back to CMD25/CMD18 multi-block transfers). ++ */ ++ card->quirks |= MMC_QUIRK_BLK_NO_CMD23; + } + EXPORT_SYMBOL(mmc_fixup_device); +diff -Nur linux-3.18.3/drivers/mmc/host/bcm2835-mmc.c linux-rpi-3.18.x/drivers/mmc/host/bcm2835-mmc.c +--- linux-3.18.3/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/mmc/host/bcm2835-mmc.c 2015-01-19 14:30:17.074226098 +0100 +@@ -0,0 +1,1557 @@ +/* + * BCM2835 MMC host driver. + * @@ -37302,6 +37342,11 @@ diff -Nur linux-3.18.1/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host + if (host->cmd == host->mrq->sbc) { + host->cmd = NULL; + bcm2835_mmc_send_command(host, host->mrq->cmd); ++ ++ if (host->mrq->cmd->data && host->use_dma) { ++ /* DMA transfer starts now, PIO starts after interrupt */ ++ bcm2835_mmc_transfer_dma(host); ++ } + } else { + + /* Processed actual command. */ @@ -37659,11 +37704,16 @@ diff -Nur linux-3.18.1/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host + WARN_ON(host->mrq != NULL); + + host->mrq = mrq; -+ bcm2835_mmc_send_command(host, mrq->cmd); ++ ++ if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23)) ++ bcm2835_mmc_send_command(host, mrq->sbc); ++ else ++ bcm2835_mmc_send_command(host, mrq->cmd); ++ + mmiowb(); + spin_unlock_irqrestore(&host->lock, flags); + -+ if (mrq->cmd->data && host->use_dma) { ++ if (!(mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23)) && mrq->cmd->data && host->use_dma) { + /* DMA transfer starts now, PIO starts after interrupt */ + bcm2835_mmc_transfer_dma(host); + } @@ -38075,9 +38125,9 @@ diff -Nur linux-3.18.1/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host +MODULE_DESCRIPTION("BCM2835 SDHCI driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); -diff -Nur linux-3.18.1/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig ---- linux-3.18.1/drivers/mmc/host/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/mmc/host/Kconfig 2015-01-09 13:30:03.604124905 -0600 +diff -Nur linux-3.18.3/drivers/mmc/host/Kconfig linux-rpi-3.18.x/drivers/mmc/host/Kconfig +--- linux-3.18.3/drivers/mmc/host/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/mmc/host/Kconfig 2015-01-19 14:30:17.074226098 +0100 @@ -281,17 +281,6 @@ If you have a controller with this interface, say Y or M here. @@ -38132,9 +38182,9 @@ diff -Nur linux-3.18.1/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconf config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff -Nur linux-3.18.1/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile ---- linux-3.18.1/drivers/mmc/host/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/mmc/host/Makefile 2015-01-09 13:30:03.604124905 -0600 +diff -Nur linux-3.18.3/drivers/mmc/host/Makefile linux-rpi-3.18.x/drivers/mmc/host/Makefile +--- linux-3.18.3/drivers/mmc/host/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/mmc/host/Makefile 2015-01-19 14:30:17.074226098 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o @@ -38143,9 +38193,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c ---- linux-3.18.1/drivers/net/usb/smsc95xx.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/net/usb/smsc95xx.c 2015-01-09 13:30:04.008124902 -0600 +diff -Nur linux-3.18.3/drivers/net/usb/smsc95xx.c linux-rpi-3.18.x/drivers/net/usb/smsc95xx.c +--- linux-3.18.3/drivers/net/usb/smsc95xx.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/usb/smsc95xx.c 2015-01-19 14:30:17.258226093 +0100 @@ -59,6 +59,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -38225,9 +38275,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/net/wireless/Kconfig linux-rpi/drivers/net/wireless/Kconfig ---- linux-3.18.1/drivers/net/wireless/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/Kconfig 2015-01-09 13:30:04.020124902 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/Kconfig linux-rpi-3.18.x/drivers/net/wireless/Kconfig +--- linux-3.18.3/drivers/net/wireless/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/Kconfig 2015-01-19 14:30:17.266226093 +0100 @@ -277,7 +277,8 @@ source "drivers/net/wireless/orinoco/Kconfig" source "drivers/net/wireless/p54/Kconfig" @@ -38238,9 +38288,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/Kconfig linux-rpi/drivers/net/wirele source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/mwifiex/Kconfig" -diff -Nur linux-3.18.1/drivers/net/wireless/Makefile linux-rpi/drivers/net/wireless/Makefile ---- linux-3.18.1/drivers/net/wireless/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/Makefile 2015-01-09 13:30:04.020124902 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/Makefile linux-rpi-3.18.x/drivers/net/wireless/Makefile +--- linux-3.18.3/drivers/net/wireless/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/Makefile 2015-01-19 14:30:17.266226093 +0100 @@ -24,7 +24,8 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw/ obj-$(CONFIG_RTL8180) += rtl818x/ @@ -38251,18 +38301,18 @@ diff -Nur linux-3.18.1/drivers/net/wireless/Makefile linux-rpi/drivers/net/wirel # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/clean linux-rpi/drivers/net/wireless/rtl8192cu/clean ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/clean 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/clean 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/clean linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/clean +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/clean 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/clean 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,5 @@ +#!/bin/bash +rmmod 8192cu +rmmod 8192ce +rmmod 8192du +rmmod 8192de -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1147 @@ +/****************************************************************************** + * @@ -39411,9 +39461,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c lin +#endif //PLATFORM_LINUX + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ap.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,2940 @@ +/****************************************************************************** + * @@ -42355,9 +42405,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi/dr +#endif //CONFIG_NATIVEAP_MLME +#endif //CONFIG_AP_MODE + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1699 @@ +/****************************************************************************** + * @@ -44058,9 +44108,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rp +} + +#endif // CONFIG_BR_EXT -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,3035 @@ +/****************************************************************************** + * @@ -47097,9 +47147,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi/d + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_debug.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1337 @@ +/****************************************************************************** + * @@ -48438,9 +48488,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,423 @@ +/****************************************************************************** + * @@ -48865,9 +48915,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rp +_func_exit_; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1915 @@ +/****************************************************************************** + * @@ -50784,9 +50834,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux + return _action_public_str[action]; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_io.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_io.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_io.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_io.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,464 @@ +/****************************************************************************** + * @@ -51252,9 +51302,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi/dr +#endif + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,196 @@ +/****************************************************************************** + * @@ -51452,9 +51502,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c lin +} +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 2015-01-09 12:27:22.940159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1031 @@ +/****************************************************************************** + * @@ -52487,9 +52537,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux + return status; +} +//************** oid_rtl_seg_03_00 section end ************** -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,1494 @@ +/****************************************************************************** + * @@ -53985,9 +54035,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux + return _FAIL; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_iol.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,263 @@ +/****************************************************************************** + * @@ -54252,9 +54302,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi/d + +#endif //CONFIG_IOL + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 2015-01-19 14:27:14.094231534 +0100 @@ -0,0 +1,3967 @@ +/****************************************************************************** + * @@ -58223,9 +58273,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi/ +} +#endif //CONFIG_CONCURRENT_MODE + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,13600 @@ +/****************************************************************************** + * @@ -71827,9 +71877,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux- + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mp.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,1324 @@ +/****************************************************************************** + * @@ -73155,9 +73205,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi/dr + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,2954 @@ +/****************************************************************************** + * @@ -76113,9 +76163,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux- +#endif +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,5294 @@ +/****************************************************************************** + * @@ -81411,9 +81461,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi/d + +#endif //CONFIG_P2P + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 2015-01-09 12:27:22.944159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,1540 @@ +/****************************************************************************** + * @@ -82955,9 +83005,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-r +} + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_recv.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,4289 @@ +/****************************************************************************** + * @@ -87248,9 +87298,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi/ + + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_rf.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,95 @@ +/****************************************************************************** + * @@ -87347,9 +87397,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi/dr + return ch; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_security.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_security.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_security.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_security.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,3115 @@ +/****************************************************************************** + * @@ -90466,9 +90516,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux- + return status; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,352 @@ +/****************************************************************************** + * @@ -90822,9 +90872,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rp +#endif +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,848 @@ +/****************************************************************************** + * @@ -91674,9 +91724,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-r + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,2941 @@ +/****************************************************************************** + * @@ -94619,9 +94669,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi/ + +#endif //CONFIG_TDLS + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,2305 @@ +/****************************************************************************** + * @@ -96928,9 +96978,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux + return status; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,4156 @@ +/****************************************************************************** + * @@ -101088,9 +101138,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi/ +} +#endif //CONFIG_XMIT_ACK + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/dm.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/dm.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,314 @@ +/****************************************************************************** + * @@ -101406,9 +101456,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi/drivers +#endif /* CONFIG_DM_ADAPTIVITY */ +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/dm.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/dm.h 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,30 @@ +/****************************************************************************** + * @@ -101440,9 +101490,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi/drivers +void dm_adaptivity(_adapter *pAdapter); + +#endif /* __DM_H__ */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_com.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/hal_com.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_com.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/hal_com.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,371 @@ +/****************************************************************************** + * @@ -101815,9 +101865,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi/dr + return ret; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/hal_intf.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,546 @@ +/****************************************************************************** + * @@ -102365,9 +102415,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi/d + return adapter->HalFunc.c2h_id_filter_ccx; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 2015-01-19 14:27:14.098231534 +0100 @@ -0,0 +1,177 @@ +/****************************************************************************** + * @@ -102546,9 +102596,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-r +} + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,1159 @@ +/****************************************************************************** + * @@ -103709,9 +103759,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd. + + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 2015-01-09 12:27:22.948159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,5056 @@ +/****************************************************************************** + * @@ -108769,9 +108819,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,3628 @@ +/****************************************************************************** + * @@ -112401,9 +112451,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_ + pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8192c; +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,1207 @@ +/****************************************************************************** + * @@ -113612,9 +113662,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c +} + +#endif // CONFIG_MP_INCLUDE -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,4841 @@ +/****************************************************************************** + * @@ -118457,9 +118507,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phyc + } +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,1031 @@ +/****************************************************************************** + * @@ -119492,9 +119542,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf60 + +/* End of HalRf6052.c */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,876 @@ +/****************************************************************************** + * @@ -120372,9 +120422,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxde +} + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,94 @@ +/****************************************************************************** + * @@ -120470,9 +120520,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sres +} +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 2015-01-09 12:27:22.952159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,63 @@ +/****************************************************************************** + * @@ -120537,9 +120587,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit +} +#endif //CONFIG_XMIT_ACK + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 2015-01-19 14:27:14.102231534 +0100 @@ -0,0 +1,8758 @@ +/****************************************************************************** + * @@ -129299,9 +129349,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU +0xc78,0x621f001e, +}; + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,2564 @@ +/****************************************************************************** + * @@ -131867,9 +131917,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU + + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,2675 @@ +/****************************************************************************** + * @@ -134546,9 +134596,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu + DeInitLed871x( &(ledpriv->SwLed1) ); +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,229 @@ +/****************************************************************************** + * @@ -134779,9 +134829,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu +} + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1150 @@ +/****************************************************************************** + * @@ -135933,9 +135983,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu +} +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,6261 @@ +/****************************************************************************** + * @@ -142198,9 +142248,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halin + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1207 @@ +/****************************************************************************** + * @@ -143409,9 +143459,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_c +} + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1536 @@ +/****************************************************************************** + * @@ -144949,9 +144999,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_l + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1265 @@ +/****************************************************************************** + * @@ -146218,18 +146268,18 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_x + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,4 @@ +#DHCP client +DEVICE=wlan0 +BOOTPROTO=dhcp +ONBOOT=yes \ No newline at end of file -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/autoconf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h 2015-01-09 13:30:04.164124899 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/autoconf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/autoconf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/autoconf.h 2015-01-19 14:30:17.358226090 +0100 @@ -0,0 +1,336 @@ +/****************************************************************************** + * @@ -146567,9 +146617,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-r + +//turn off power tracking when traffic is busy +//#define CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/basic_types.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/basic_types.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/basic_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/basic_types.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,321 @@ +/****************************************************************************** + * @@ -146892,9 +146942,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/basic_types.h linu + +#endif //__BASIC_TYPES_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,87 @@ +/****************************************************************************** + * @@ -146983,9 +147033,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/big_endi +#include <byteorder/generic.h> + +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,212 @@ +/****************************************************************************** + * @@ -147199,9 +147249,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/generic. +#endif + +#endif /* _LINUX_BYTEORDER_GENERIC_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,89 @@ +/****************************************************************************** + * @@ -147292,9 +147342,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/little_e +#include <byteorder/generic.h> + +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,156 @@ +/****************************************************************************** + * @@ -147452,9 +147502,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h +#endif + +#endif /* _LINUX_BYTEORDER_SWABB_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,140 @@ +/****************************************************************************** + * @@ -147596,9 +147646,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h l +#endif + +#endif /* _LINUX_BYTEORDER_SWAB_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/circ_buf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/circ_buf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/circ_buf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/circ_buf.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,27 @@ +/****************************************************************************** + * @@ -147627,9 +147677,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-r +#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) + +#endif //_CIRC_BUF_H_ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,36 @@ +/****************************************************************************** + * @@ -147667,9 +147717,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux- + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_conf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_conf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_conf.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,78 @@ +/****************************************************************************** + * @@ -147749,9 +147799,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-r + +#endif // __DRV_CONF_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,92 @@ +/****************************************************************************** + * @@ -147845,9 +147895,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h lin + + +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,662 @@ +/****************************************************************************** + * @@ -148511,9 +148561,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types.h linux- + +#endif //__DRV_TYPES_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,25 @@ +/****************************************************************************** + * @@ -148540,9 +148590,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,70 @@ +/****************************************************************************** + * @@ -148614,9 +148664,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h l + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,95 @@ +/****************************************************************************** + * @@ -148713,9 +148763,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h lin + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ethernet.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ethernet.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ethernet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ethernet.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,41 @@ +/****************************************************************************** + * @@ -148758,9 +148808,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-r + + +#endif // #ifndef __INC_ETHERNET_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/h2clbk.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/h2clbk.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/h2clbk.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/h2clbk.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,35 @@ +/****************************************************************************** + * @@ -148797,9 +148847,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi +void _lbk_evt(IN PADAPTER Adapter); + +void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,85 @@ +/****************************************************************************** + * @@ -148886,9 +148936,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h l +extern u32 Rtl8192CEAGCTAB_1TArray[AGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CE_FW_IMG_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,428 @@ +/****************************************************************************** + * @@ -149318,9 +149368,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h l + +#endif // __INC_HAL8192CPHYCFG_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1123 @@ +/****************************************************************************** + * @@ -150445,9 +150495,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h l + +#endif //__INC_HAL8192SPHYREG_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,105 @@ +/****************************************************************************** + * @@ -150554,9 +150604,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h l +extern u32 Rtl8192CUAGCTAB_1T_HPArray[AGCTAB_1T_HPArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,34 @@ +/****************************************************************************** + * @@ -150592,9 +150642,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wow + +#endif //__INC_HAL8192CU_FW_IMG_WOWLAN_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,66 @@ +/****************************************************************************** + * @@ -150662,9 +150712,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h l +extern const u32 Rtl8192DEAGCTAB_1TArray[Rtl8192DEAGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,528 @@ +/****************************************************************************** + * @@ -151194,9 +151244,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h l + +#endif // __INC_HAL8192SPHYCFG_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1171 @@ +/****************************************************************************** + * @@ -152369,9 +152419,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h l + +#endif //__INC_HAL8192SPHYREG_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,66 @@ +/****************************************************************************** + * @@ -152439,9 +152489,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h l +extern const u32 Rtl8192DUAGCTAB_1TArray[Rtl8192DUAGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,30 @@ +/****************************************************************************** + * @@ -152473,9 +152523,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wow + +#endif //__INC_HAL8192DU_FW_IMG_WOWLAN_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_com.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/hal_com.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_com.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/hal_com.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,146 @@ +/****************************************************************************** + * @@ -152623,9 +152673,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rp + +#endif //__HAL_COMMON_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_intf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/hal_intf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_intf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/hal_intf.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,432 @@ +/****************************************************************************** + * @@ -153059,9 +153109,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-r + +#endif //__HAL_INTF_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 2015-01-09 12:27:22.956159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,137 @@ +/****************************************************************************** + * @@ -153200,9 +153250,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h lin + WLAN_PWR_CFG PwrCfgCmd[]); + +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,477 @@ +/****************************************************************************** + * @@ -153681,9 +153731,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ieee80211.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1580 @@ +/****************************************************************************** + * @@ -155265,9 +155315,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux- + +#endif /* IEEE80211_H */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/if_ether.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/if_ether.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/if_ether.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/if_ether.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,112 @@ +/****************************************************************************** + * @@ -155381,9 +155431,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-r + + +#endif /* _LINUX_IF_ETHER_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,180 @@ +/****************************************************************************** + * @@ -155565,9 +155615,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h l + +#endif //__IOCTL_CFG80211_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ip.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ip.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ip.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/ip.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,141 @@ +/****************************************************************************** + * @@ -155710,9 +155760,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi/dri +}; + +#endif /* _LINUX_IP_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/linux/wireless.h linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/linux/wireless.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/linux/wireless.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,90 @@ +/****************************************************************************** + * @@ -155804,9 +155854,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/linux/wireless.h l +}; + +#endif /* _LINUX_WIRELESS_H */ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,40 @@ +/****************************************************************************** + * @@ -155848,9 +155898,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux + +#endif //_MLME_OSDEP_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,353 @@ +/****************************************************************************** + * @@ -156205,9 +156255,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h li +#define OID_RT_PRO_EFUSE_MAP 0xFF871217 //Q, S + +#endif //#ifndef __CUSTOM_OID_H -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/nic_spec.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/nic_spec.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/nic_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/nic_spec.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,47 @@ +/****************************************************************************** + * @@ -156256,9 +156306,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-r + +#endif // __RTL8711_SPEC_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,171 @@ +/****************************************************************************** + * @@ -156431,9 +156481,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h +} +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_intf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,155 @@ +/****************************************************************************** + * @@ -156590,9 +156640,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux + +#endif //_OSDEP_INTF_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_service.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_service.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_service.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/osdep_service.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,1815 @@ +/****************************************************************************** + * @@ -158409,9 +158459,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/osdep_service.h li +#endif + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_hal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_hal.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_hal.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,168 @@ +/****************************************************************************** + * @@ -158581,9 +158631,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rp + +#endif //__PCIE_HAL_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_ops.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_ops.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_ops.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,60 @@ +/****************************************************************************** + * @@ -158645,9 +158695,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rp +#endif + +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_osintf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,33 @@ +/****************************************************************************** + * @@ -158682,9 +158732,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/recv_osdep.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 2015-01-19 14:27:14.106231534 +0100 @@ -0,0 +1,58 @@ +/****************************************************************************** + * @@ -158744,9 +158794,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux + +#endif // + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,153 @@ +/****************************************************************************** + * @@ -158901,9 +158951,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h lin + +#endif // __RTL8192C_CMD_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,516 @@ +/****************************************************************************** + * @@ -159421,9 +159471,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linu + +#endif //__HAL8190PCIDM_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,28 @@ +/****************************************************************************** + * @@ -159453,9 +159503,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h l +#endif + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,937 @@ +/****************************************************************************** + * @@ -160394,9 +160444,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h lin + + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,42 @@ +/****************************************************************************** + * @@ -160440,9 +160490,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h lin + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,184 @@ +/****************************************************************************** + * @@ -160628,9 +160678,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,92 @@ +/****************************************************************************** + * @@ -160724,9 +160774,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linu + +#endif/* End of HalRf.h */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1865 @@ +/****************************************************************************** + * @@ -162593,9 +162643,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,32 @@ +/****************************************************************************** + * @@ -162629,9 +162679,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h +extern void rtl8192c_sreset_linked_status_check(_adapter *padapter); +#endif +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,129 @@ +/****************************************************************************** + * @@ -162762,9 +162812,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,142 @@ +/****************************************************************************** + * @@ -162908,9 +162958,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h lin +#endif // __RTL8192D_CMD_H_ + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,420 @@ +/****************************************************************************** + * @@ -163332,9 +163382,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linu +VOID rtl8192d_dm_CheckTXPowerTracking(IN PADAPTER Adapter); + +#endif //__HAL8190PCIDM_H__ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1126 @@ +/****************************************************************************** + * @@ -164462,9 +164512,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h lin + +#endif //end CONFIG_MP_INCLUDED + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,43 @@ +/****************************************************************************** + * @@ -164509,9 +164559,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h lin + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,187 @@ +/****************************************************************************** + * @@ -164700,9 +164750,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,97 @@ +/****************************************************************************** + * @@ -164801,9 +164851,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linu + +#endif/* End of HalRf.h */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1841 @@ +/****************************************************************************** + * @@ -166646,9 +166696,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 2015-01-09 12:27:22.960159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,145 @@ +/****************************************************************************** + * @@ -166795,9 +166845,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_android.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_android.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_android.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_android.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,90 @@ +/****************************************************************************** + * @@ -166889,9 +166939,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_android.h linu + +#endif //__RTW_ANDROID_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ap.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,64 @@ +/****************************************************************************** + * @@ -166957,9 +167007,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,76 @@ +/****************************************************************************** + * @@ -167037,9 +167087,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux + +#endif // _RTW_BR_EXT_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,40 @@ +/****************************************************************************** + * @@ -167081,9 +167131,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h li + +#endif /* _RTL871X_BYTEORDER_H_ */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1167 @@ +/****************************************************************************** + * @@ -168252,9 +168302,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rp + +#endif // _CMD_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_debug.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,538 @@ +/****************************************************************************** + * @@ -168794,9 +168844,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux- + +#endif //__RTW_DEBUG_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,152 @@ +/****************************************************************************** + * @@ -168950,9 +169000,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux +#endif //PLATFORM_LINUX + +#endif //__RTL871X_EEPROM_H__ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,124 @@ +/****************************************************************************** + * @@ -169078,9 +169128,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux- + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_event.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_event.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_event.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,154 @@ +/****************************************************************************** + * @@ -169236,9 +169286,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux- + +#endif // _WLANEVENT_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ht.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,50 @@ +/****************************************************************************** + * @@ -169290,9 +169340,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi + +#endif //_RTL871X_HT_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,269 @@ +/****************************************************************************** + * @@ -169563,9 +169613,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux- + +#endif // #ifndef __INC_CEINFO_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,36 @@ +/****************************************************************************** + * @@ -169603,9 +169653,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,83 @@ +/****************************************************************************** + * @@ -169690,9 +169740,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h li + + +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,79 @@ +/****************************************************************************** + * @@ -169773,9 +169823,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_io.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_io.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_io.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,504 @@ +/****************************************************************************** + * @@ -170281,9 +170331,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi +*/ + +#endif //_RTL8711_IO_H_ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_iol.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,89 @@ +/****************************************************************************** + * @@ -170374,9 +170424,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rp +bool rtw_IOL_applied(ADAPTER *adapter); + +#endif //__RTW_IOL_H_ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_led.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_led.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_led.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,217 @@ +/****************************************************************************** + * @@ -170595,9 +170645,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rp + +#endif //__RTW_LED_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,963 @@ +/****************************************************************************** + * @@ -171562,9 +171612,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h lin + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,844 @@ +/****************************************************************************** + * @@ -172410,9 +172460,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-r +#endif //CONFIG_INTEL_PROXIM +#endif //__RTL871X_MLME_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,712 @@ +/****************************************************************************** + * @@ -173126,9 +173176,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi + +#endif //_RTW_MP_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,596 @@ +/****************************************************************************** + * @@ -173726,9 +173776,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h lin + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1097 @@ +/****************************************************************************** + * @@ -174827,9 +174877,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef. + +#endif //__INC_HAL8192SPHYREG_H + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,161 @@ +/****************************************************************************** + * @@ -174992,9 +175042,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rp + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,362 @@ +/****************************************************************************** + * @@ -175358,9 +175408,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linu +int rtw_pm_set_lps(_adapter *padapter, u8 mode); + +#endif //__RTL871X_PWRCTRL_H_ -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_qos.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,40 @@ +/****************************************************************************** + * @@ -175402,9 +175452,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rp + +#endif //_RTL871X_QOS_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_recv.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,731 @@ +/****************************************************************************** + * @@ -176137,9 +176187,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-r + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_rf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,152 @@ +/****************************************************************************** + * @@ -176293,9 +176343,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi + +#endif //_RTL8711_RF_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_security.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_security.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_security.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_security.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,447 @@ +/****************************************************************************** + * @@ -176744,9 +176794,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_security.h lin + +#endif //__RTL871X_SECURITY_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,74 @@ +/****************************************************************************** + * @@ -176822,9 +176872,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,143 @@ +/****************************************************************************** + * @@ -176969,14 +177019,14 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-r + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_version.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_version.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_version.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_version.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1 @@ +#define DRIVERVERSION "v4.0.2_9000.20130911" -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,754 @@ +/****************************************************************************** + * @@ -177732,9 +177782,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-r + +#endif //_RTL871X_XMIT_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/sta_info.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/sta_info.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/sta_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/sta_info.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,432 @@ +/****************************************************************************** + * @@ -178168,9 +178218,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-r + +#endif //_STA_INFO_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_hal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_hal.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_hal.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,37 @@ +/****************************************************************************** + * @@ -178209,9 +178259,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rp +#endif //CONFIG_WOWLAN +#endif //__USB_HAL_H__ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_ops.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_ops.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,110 @@ +/****************************************************************************** + * @@ -178323,9 +178373,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rp + +#endif //__USB_OPS_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,63 @@ +/****************************************************************************** + * @@ -178390,9 +178440,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h li + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_osintf.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,38 @@ +/****************************************************************************** + * @@ -178432,9 +178482,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux + +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,59 @@ +/****************************************************************************** + * @@ -178495,9 +178545,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h l +//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN PVOID TransferBuffer, IN ULONG TransferBufferLength); + +#endif -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wifi.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/wifi.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wifi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/wifi.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,1246 @@ +/****************************************************************************** + * @@ -179745,9 +179795,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi/d + +#endif // _WIFI_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,703 @@ +/****************************************************************************** + * @@ -180452,9 +180502,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linu + +#endif //#ifndef WLAN_BSSDEF_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,95 @@ +/****************************************************************************** + * @@ -180551,9 +180601,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux + +#endif //__XMIT_OSDEP_H_ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig 2015-01-09 13:30:04.164124899 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/Kconfig +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/Kconfig 2015-01-19 14:30:17.358226090 +0100 @@ -0,0 +1,6 @@ +config RTL8192CU + tristate "Realtek 8192C USB WiFi" @@ -180561,9 +180611,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi/drivers/ + ---help--- + Help message of RTL8192CU + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/Makefile linux-rpi/drivers/net/wireless/rtl8192cu/Makefile ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/Makefile 2015-01-09 13:30:04.164124899 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/Makefile linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/Makefile +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/Makefile 2015-01-19 14:30:17.358226090 +0100 @@ -0,0 +1,616 @@ +EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) +EXTRA_CFLAGS += -O1 @@ -181181,9 +181231,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/Makefile linux-rpi/drivers + cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko +endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 2015-01-09 12:27:22.964159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 2015-01-19 14:27:14.110231534 +0100 @@ -0,0 +1,5489 @@ +/****************************************************************************** + * @@ -186674,9 +186724,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg8021 + +#endif //CONFIG_IOCTL_CFG80211 + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,11909 @@ +/****************************************************************************** + * @@ -198587,9 +198637,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c +}; +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,586 @@ +/****************************************************************************** + * @@ -199177,9 +199227,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c +#endif +#endif + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 2015-01-09 13:30:04.164124899 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 2015-01-19 14:30:17.358226090 +0100 @@ -0,0 +1,2749 @@ +/****************************************************************************** + * @@ -201930,9 +201980,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c li + free_netdev(ndev); +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,1997 @@ +/****************************************************************************** + * @@ -203931,9 +203981,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c li +module_init(rtw_drv_entry); +module_exit(rtw_drv_halt); + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,24 @@ +/****************************************************************************** + * @@ -203959,9 +204009,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux + + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,448 @@ +/****************************************************************************** + * @@ -204411,9 +204461,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c + +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,839 @@ +/****************************************************************************** + * @@ -205254,9 +205304,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c +} +#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 2015-01-09 13:30:04.168124899 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 2015-01-19 14:30:17.358226090 +0100 @@ -0,0 +1,1655 @@ +/****************************************************************************** + * @@ -206913,9 +206963,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c li +EXPORT_SYMBOL(rtw_usb_get_sw_pointer); +#endif //CONFIG_INTEL_PROXIM + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,649 @@ +/****************************************************************************** + * @@ -207566,9 +207616,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux + } +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,421 @@ +/****************************************************************************** + * @@ -207991,9 +208041,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c + return _rtw_xmit_entry(pkt, pnetdev); +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,2300 @@ +/****************************************************************************** + * @@ -210295,9 +210345,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c lin + rtw_mfree((u8*)cbuf, sizeof(*cbuf) + sizeof(void*)*cbuf->size); +} + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/runwpa linux-rpi/drivers/net/wireless/rtl8192cu/runwpa ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/runwpa 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/runwpa 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/runwpa linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/runwpa +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/runwpa 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/runwpa 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,20 @@ +#!/bin/bash + @@ -210319,9 +210369,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/runwpa linux-rpi/drivers/n +fi + + -diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp ---- linux-3.18.1/drivers/net/wireless/rtl8192cu/wlan0dhcp 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp 2015-01-09 12:27:22.968159336 -0600 +diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/wlan0dhcp +--- linux-3.18.3/drivers/net/wireless/rtl8192cu/wlan0dhcp 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/net/wireless/rtl8192cu/wlan0dhcp 2015-01-19 14:27:14.114231534 +0100 @@ -0,0 +1,16 @@ +#!/bin/bash + @@ -210339,9 +210389,9 @@ diff -Nur linux-3.18.1/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi/driver + +echo "get ip: $var1" + -diff -Nur linux-3.18.1/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c ---- linux-3.18.1/drivers/of/fdt.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/of/fdt.c 2015-01-09 13:30:04.220124900 -0600 +diff -Nur linux-3.18.3/drivers/of/fdt.c linux-rpi-3.18.x/drivers/of/fdt.c +--- linux-3.18.3/drivers/of/fdt.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/of/fdt.c 2015-01-19 14:30:17.390226089 +0100 @@ -901,19 +901,38 @@ /* Retrieve command line */ @@ -210400,9 +210450,9 @@ diff -Nur linux-3.18.1/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c if (!d) return -ENOENT; -diff -Nur linux-3.18.1/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c ---- linux-3.18.1/drivers/pinctrl/pinctrl-bcm2835.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c 2015-01-09 13:30:04.256124900 -0600 +diff -Nur linux-3.18.3/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi-3.18.x/drivers/pinctrl/pinctrl-bcm2835.c +--- linux-3.18.3/drivers/pinctrl/pinctrl-bcm2835.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/pinctrl/pinctrl-bcm2835.c 2015-01-19 14:30:17.410226088 +0100 @@ -382,7 +382,7 @@ .get = bcm2835_gpio_get, .set = bcm2835_gpio_set, @@ -210412,9 +210462,9 @@ diff -Nur linux-3.18.1/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinct .ngpio = BCM2835_NUM_GPIOS, .can_sleep = false, }; -diff -Nur linux-3.18.1/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig ---- linux-3.18.1/drivers/spi/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/spi/Kconfig 2015-01-09 13:30:04.480124896 -0600 +diff -Nur linux-3.18.3/drivers/spi/Kconfig linux-rpi-3.18.x/drivers/spi/Kconfig +--- linux-3.18.3/drivers/spi/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/spi/Kconfig 2015-01-19 14:30:17.554226084 +0100 @@ -77,7 +77,7 @@ config SPI_BCM2835 @@ -210439,9 +210489,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile ---- linux-3.18.1/drivers/spi/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/spi/Makefile 2015-01-09 13:30:04.480124896 -0600 +diff -Nur linux-3.18.3/drivers/spi/Makefile linux-rpi-3.18.x/drivers/spi/Makefile +--- linux-3.18.3/drivers/spi/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/spi/Makefile 2015-01-19 14:30:17.554226084 +0100 @@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o @@ -210450,9 +210500,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c ---- linux-3.18.1/drivers/spi/spi-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/spi/spi-bcm2708.c 2015-01-09 13:30:04.480124896 -0600 +diff -Nur linux-3.18.3/drivers/spi/spi-bcm2708.c linux-rpi-3.18.x/drivers/spi/spi-bcm2708.c +--- linux-3.18.3/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/spi/spi-bcm2708.c 2015-01-19 14:30:17.554226084 +0100 @@ -0,0 +1,635 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -211089,9 +211139,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig ---- linux-3.18.1/drivers/staging/media/lirc/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/staging/media/lirc/Kconfig 2015-01-09 12:27:23.468159330 -0600 +diff -Nur linux-3.18.3/drivers/staging/media/lirc/Kconfig linux-rpi-3.18.x/drivers/staging/media/lirc/Kconfig +--- linux-3.18.3/drivers/staging/media/lirc/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/staging/media/lirc/Kconfig 2015-01-19 14:27:14.466231523 +0100 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -211105,10 +211155,10 @@ diff -Nur linux-3.18.1/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.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c ---- linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2015-01-09 13:30:04.624124895 -0600 -@@ -0,0 +1,765 @@ +diff -Nur linux-3.18.3/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.18.x/drivers/staging/media/lirc/lirc_rpi.c +--- linux-3.18.3/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/staging/media/lirc/lirc_rpi.c 2015-01-19 14:30:17.642226081 +0100 +@@ -0,0 +1,757 @@ +/* + * lirc_rpi.c + * @@ -211356,9 +211406,6 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + /* use the GPIO signal level */ + signal = gpiochip->get(gpiochip, gpio_in_pin); + -+ /* unmask the irq */ -+ enable_irq(irq_num); -+ + if (sense != -1) { + /* get current time */ + do_gettimeofday(&tv); @@ -211556,8 +211603,6 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + + return 0; + -+ gpio_free(gpio_in_pin); -+ + exit_gpio_free_out_pin: + gpio_free(gpio_out_pin); + @@ -211574,7 +211619,8 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + do_gettimeofday(&lasttv); + + result = request_irq(irq_num, -+ (irq_handler_t) irq_handler, 0, ++ (irq_handler_t) irq_handler, ++ IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING, + LIRC_DRIVER_NAME, (void*) 0); + + switch (result) { @@ -211596,12 +211642,6 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + /* initialize pulse/space widths */ + init_timing_params(duty_cycle, freq); + -+ /* GPIO Pin Falling/Rising Edge Detect Enable */ -+ irq_set_irq_type(irq_num, IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING); -+ -+ /* enable the irq */ -+ enable_irq(irq_num); -+ + return 0; +} + @@ -211789,7 +211829,8 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + +static void lirc_rpi_exit(void) +{ -+ platform_device_unregister(lirc_rpi_dev); ++ if (!lirc_rpi_dev->dev.of_node) ++ platform_device_unregister(lirc_rpi_dev); + platform_driver_unregister(&lirc_rpi_driver); + lirc_buffer_free(&rbuf); +} @@ -211833,12 +211874,13 @@ diff -Nur linux-3.18.1/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + +static void __exit lirc_rpi_exit_module(void) +{ ++ lirc_unregister_driver(driver.minor); ++ + gpio_free(gpio_out_pin); + gpio_free(gpio_in_pin); + + lirc_rpi_exit(); + -+ lirc_unregister_driver(driver.minor); + printk(KERN_INFO LIRC_DRIVER_NAME ": cleaned up module\n"); +} + @@ -211874,9 +211916,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile ---- linux-3.18.1/drivers/staging/media/lirc/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/staging/media/lirc/Makefile 2015-01-09 12:27:23.468159330 -0600 +diff -Nur linux-3.18.3/drivers/staging/media/lirc/Makefile linux-rpi-3.18.x/drivers/staging/media/lirc/Makefile +--- linux-3.18.3/drivers/staging/media/lirc/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/staging/media/lirc/Makefile 2015-01-19 14:27:14.466231523 +0100 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -211885,9 +211927,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c ---- linux-3.18.1/drivers/thermal/bcm2835-thermal.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2015-01-09 12:27:23.632159330 -0600 +diff -Nur linux-3.18.3/drivers/thermal/bcm2835-thermal.c linux-rpi-3.18.x/drivers/thermal/bcm2835-thermal.c +--- linux-3.18.3/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/thermal/bcm2835-thermal.c 2015-01-19 14:27:14.578231520 +0100 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -212073,9 +212115,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig ---- linux-3.18.1/drivers/thermal/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/thermal/Kconfig 2015-01-09 13:30:04.756124895 -0600 +diff -Nur linux-3.18.3/drivers/thermal/Kconfig linux-rpi-3.18.x/drivers/thermal/Kconfig +--- linux-3.18.3/drivers/thermal/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/thermal/Kconfig 2015-01-19 14:30:17.714226079 +0100 @@ -206,6 +206,12 @@ enforce idle time which results in more package C-state residency. The user interface is exposed via generic thermal framework. @@ -212089,9 +212131,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile ---- linux-3.18.1/drivers/thermal/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/thermal/Makefile 2015-01-09 13:30:04.756124895 -0600 +diff -Nur linux-3.18.3/drivers/thermal/Makefile linux-rpi-3.18.x/drivers/thermal/Makefile +--- linux-3.18.3/drivers/thermal/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/thermal/Makefile 2015-01-19 14:30:17.714226079 +0100 @@ -29,6 +29,7 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o @@ -212100,9 +212142,9 @@ diff -Nur linux-3.18.1/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefi obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ -diff -Nur linux-3.18.1/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c ---- linux-3.18.1/drivers/tty/serial/amba-pl011.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/tty/serial/amba-pl011.c 2015-01-09 13:30:04.768124895 -0600 +diff -Nur linux-3.18.3/drivers/tty/serial/amba-pl011.c linux-rpi-3.18.x/drivers/tty/serial/amba-pl011.c +--- linux-3.18.3/drivers/tty/serial/amba-pl011.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/tty/serial/amba-pl011.c 2015-01-19 14:30:17.726226079 +0100 @@ -84,7 +84,7 @@ static unsigned int get_fifosize_arm(struct amba_device *dev) @@ -212112,9 +212154,9 @@ diff -Nur linux-3.18.1/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/ser } static struct vendor_data vendor_arm = { -diff -Nur linux-3.18.1/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c ---- linux-3.18.1/drivers/usb/core/generic.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/core/generic.c 2015-01-09 13:30:04.800124895 -0600 +diff -Nur linux-3.18.3/drivers/usb/core/generic.c linux-rpi-3.18.x/drivers/usb/core/generic.c +--- linux-3.18.3/drivers/usb/core/generic.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/core/generic.c 2015-01-19 14:30:17.746226078 +0100 @@ -152,6 +152,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -212123,9 +212165,9 @@ diff -Nur linux-3.18.1/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/gen } return i; } -diff -Nur linux-3.18.1/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c ---- linux-3.18.1/drivers/usb/core/hub.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/core/hub.c 2015-01-09 13:30:04.804124894 -0600 +diff -Nur linux-3.18.3/drivers/usb/core/hub.c linux-rpi-3.18.x/drivers/usb/core/hub.c +--- linux-3.18.3/drivers/usb/core/hub.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/core/hub.c 2015-01-19 14:30:17.746226078 +0100 @@ -4923,7 +4923,7 @@ if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -212135,9 +212177,9 @@ diff -Nur linux-3.18.1/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); msleep(100); /* Cool down */ -diff -Nur linux-3.18.1/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c ---- linux-3.18.1/drivers/usb/core/message.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/core/message.c 2015-01-09 13:30:04.804124894 -0600 +diff -Nur linux-3.18.3/drivers/usb/core/message.c linux-rpi-3.18.x/drivers/usb/core/message.c +--- linux-3.18.3/drivers/usb/core/message.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/core/message.c 2015-01-19 14:30:17.746226078 +0100 @@ -1889,6 +1889,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -212224,9 +212266,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h ---- linux-3.18.1/drivers/usb/core/otg_whitelist.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/core/otg_whitelist.h 2015-01-09 13:30:04.804124894 -0600 +diff -Nur linux-3.18.3/drivers/usb/core/otg_whitelist.h linux-rpi-3.18.x/drivers/usb/core/otg_whitelist.h +--- linux-3.18.3/drivers/usb/core/otg_whitelist.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/core/otg_whitelist.h 2015-01-19 14:30:17.746226078 +0100 @@ -19,87 +19,153 @@ static struct usb_device_id whitelist_table [] = { @@ -212430,9 +212472,9 @@ diff -Nur linux-3.18.1/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/co return 0; } -diff -Nur linux-3.18.1/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c ---- linux-3.18.1/drivers/usb/gadget/file_storage.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/gadget/file_storage.c 2015-01-09 12:27:23.692159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/gadget/file_storage.c linux-rpi-3.18.x/drivers/usb/gadget/file_storage.c +--- linux-3.18.3/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/gadget/file_storage.c 2015-01-19 14:27:14.622231519 +0100 @@ -0,0 +1,3676 @@ +/* + * file_storage.c -- File-backed USB Storage Gadget, for USB development @@ -216110,9 +216152,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt ---- linux-3.18.1/drivers/usb/host/dwc_common_port/changes.txt 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/changes.txt 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/changes.txt +--- linux-3.18.3/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/changes.txt 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -216288,9 +216330,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-3.18.1/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-3.18.3/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -216562,9 +216604,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rp +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_cc.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -217098,9 +217140,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drive +} + +#endif /* DWC_CCLIB */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_cc.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,224 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -217326,9 +217368,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drive +#endif + +#endif /* _DWC_CC_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -218638,9 +218680,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,1440 @@ +#include <linux/kernel.h> +#include <linux/init.h> @@ -220082,9 +220124,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -221361,9 +221403,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_crypto.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -221673,9 +221715,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/d +} + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_crypto.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -221788,9 +221830,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/d +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_dh.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -222083,9 +222125,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drive +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_dh.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -222193,9 +222235,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drive +#endif + +#endif /* _DWC_DH_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_list.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_list.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,594 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -222791,9 +222833,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/dri +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_mem.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_mem.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -223040,9 +223082,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/driv +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_modpow.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -223680,9 +223722,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/d +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_modpow.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -223718,9 +223760,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/d +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_notifier.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -224041,9 +224083,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_notifier.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -224167,9 +224209,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_os.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/dwc_os.h 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,1276 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -225447,9 +225489,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drive +#endif + +#endif /* _DWC_OS_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.18.1/drivers/usb/host/dwc_common_port/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -225509,9 +225551,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-3.18.1/drivers/usb/host/dwc_common_port/Makefile.fbsd 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile.fbsd 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -225530,9 +225572,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.18.1/drivers/usb/host/dwc_common_port/Makefile.linux 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux 2015-01-09 12:27:23.708159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/Makefile.linux 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -225583,9 +225625,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.18.1/drivers/usb/host/dwc_common_port/usb.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_common_port/usb.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.18.3/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_common_port/usb.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -226533,9 +226575,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/ +#endif + +#endif /* _USB_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-3.18.1/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.18.x/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-3.18.3/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -226761,9 +226803,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/driver +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dummy_audio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dummy_audio.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -228340,9 +228382,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -228486,9 +228528,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drive +typedef struct cfi_string cfi_string_t; + +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -229344,9 +229386,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/ +#endif + return 1; +} -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -229428,9 +229470,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -230642,9 +230684,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -230735,9 +230777,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers +#endif + ); +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -232615,9 +232657,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/ +} + +#endif //DWC_UTE_CFI -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -232939,9 +232981,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -240094,9 +240136,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -241562,9 +241604,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/ +////////////////////////////////////////////////////////////////////// + +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,1594 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -243160,9 +243202,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/dri + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -243869,9 +243911,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/driv +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -243990,9 +244032,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/ + +#endif /*DEBUG*/ +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,1749 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -245743,9 +245785,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drive + </td></tr> + +*/ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -245833,9 +245875,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drive +#endif + +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,1294 @@ +/* + * dwc_otg_fiq_fsm.c - The finite state machine FIQ @@ -247131,9 +247173,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/driv + state->fiq_done++; + mb(); +} -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,353 @@ +/* + * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions @@ -247488,9 +247530,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,81 @@ +/* + * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ @@ -247573,9 +247615,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,4217 @@ + +/* ========================================================================== @@ -251794,9 +251836,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -252930,9 +252972,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/dri +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,862 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -253796,9 +253838,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -254217,9 +254259,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,2688 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -256909,9 +256951,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/dri + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,985 @@ + +/* ========================================================================== @@ -257898,9 +257940,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,943 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -258845,9 +258887,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -259037,9 +259079,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drive + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2015-01-19 14:30:17.766226078 +0100 @@ -0,0 +1,2712 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -261753,9 +261795,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -262023,9 +262065,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -262387,9 +262429,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -267538,9 +267580,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/dri +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,1360 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -268902,9 +268944,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -271456,9 +271498,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers +} gpwrdn_data_t; + +#endif -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile ---- linux-3.18.1/drivers/usb/host/dwc_otg/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2015-01-09 12:27:23.712159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.18.x/drivers/usb/host/dwc_otg/Makefile +--- linux-3.18.3/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/Makefile 2015-01-19 14:27:14.634231518 +0100 @@ -0,0 +1,82 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -271542,9 +271584,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-3.18.1/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.18.3/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -271883,9 +271925,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/d +); + +1; -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.18.1/drivers/usb/host/dwc_otg/test/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.18.3/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/Makefile 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -271903,9 +271945,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/ + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-3.18.1/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.18.3/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -272040,9 +272082,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.18.1/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2015-01-09 12:27:23.716159329 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.18.3/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2015-01-19 14:27:14.638231518 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -272237,9 +272279,9 @@ diff -Nur linux-3.18.1/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/dri + +test_main(); +0; -diff -Nur linux-3.18.1/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig ---- linux-3.18.1/drivers/usb/host/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/host/Kconfig 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/Kconfig linux-rpi-3.18.x/drivers/usb/host/Kconfig +--- linux-3.18.3/drivers/usb/host/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/Kconfig 2015-01-19 14:30:17.766226078 +0100 @@ -744,6 +744,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -272260,9 +272302,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile ---- linux-3.18.1/drivers/usb/host/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/host/Makefile 2015-01-09 13:30:04.836124893 -0600 +diff -Nur linux-3.18.3/drivers/usb/host/Makefile linux-rpi-3.18.x/drivers/usb/host/Makefile +--- linux-3.18.3/drivers/usb/host/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/host/Makefile 2015-01-19 14:30:17.766226078 +0100 @@ -71,6 +71,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -272272,9 +272314,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile ---- linux-3.18.1/drivers/usb/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/usb/Makefile 2015-01-09 13:30:04.796124895 -0600 +diff -Nur linux-3.18.3/drivers/usb/Makefile linux-rpi-3.18.x/drivers/usb/Makefile +--- linux-3.18.3/drivers/usb/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/usb/Makefile 2015-01-19 14:30:17.742226078 +0100 @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -272283,9 +272325,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c ---- linux-3.18.1/drivers/video/fbdev/bcm2708_fb.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2015-01-09 13:30:04.912124893 -0600 +diff -Nur linux-3.18.3/drivers/video/fbdev/bcm2708_fb.c linux-rpi-3.18.x/drivers/video/fbdev/bcm2708_fb.c +--- linux-3.18.3/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/fbdev/bcm2708_fb.c 2015-01-19 14:30:17.818226076 +0100 @@ -0,0 +1,818 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -273105,9 +273147,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c ---- linux-3.18.1/drivers/video/fbdev/core/cfbimgblt.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2015-01-09 13:30:04.912124893 -0600 +diff -Nur linux-3.18.3/drivers/video/fbdev/core/cfbimgblt.c linux-rpi-3.18.x/drivers/video/fbdev/core/cfbimgblt.c +--- linux-3.18.3/drivers/video/fbdev/core/cfbimgblt.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/fbdev/core/cfbimgblt.c 2015-01-19 14:30:17.822226076 +0100 @@ -28,6 +28,11 @@ * * Also need to add code to deal with cards endians that are different than @@ -273281,9 +273323,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c ---- linux-3.18.1/drivers/video/fbdev/core/fbmem.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2015-01-09 13:30:04.916124892 -0600 +diff -Nur linux-3.18.3/drivers/video/fbdev/core/fbmem.c linux-rpi-3.18.x/drivers/video/fbdev/core/fbmem.c +--- linux-3.18.3/drivers/video/fbdev/core/fbmem.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/fbdev/core/fbmem.c 2015-01-19 14:30:17.822226076 +0100 @@ -1084,6 +1084,25 @@ } EXPORT_SYMBOL(fb_blank); @@ -273342,9 +273384,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig ---- linux-3.18.1/drivers/video/fbdev/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/video/fbdev/Kconfig 2015-01-09 13:30:04.904124894 -0600 +diff -Nur linux-3.18.3/drivers/video/fbdev/Kconfig linux-rpi-3.18.x/drivers/video/fbdev/Kconfig +--- linux-3.18.3/drivers/video/fbdev/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/fbdev/Kconfig 2015-01-19 14:30:17.814226076 +0100 @@ -224,6 +224,20 @@ comment "Frame buffer hardware drivers" depends on FB @@ -273366,9 +273408,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile ---- linux-3.18.1/drivers/video/fbdev/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/video/fbdev/Makefile 2015-01-09 13:30:04.904124894 -0600 +diff -Nur linux-3.18.3/drivers/video/fbdev/Makefile linux-rpi-3.18.x/drivers/video/fbdev/Makefile +--- linux-3.18.3/drivers/video/fbdev/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/fbdev/Makefile 2015-01-19 14:30:17.814226076 +0100 @@ -12,6 +12,7 @@ obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o @@ -273377,9 +273419,9 @@ diff -Nur linux-3.18.1/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) += clps711x-fb.o -diff -Nur linux-3.18.1/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.18.1/drivers/video/logo/logo_linux_clut224.ppm 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2015-01-09 12:27:23.812159328 -0600 +diff -Nur linux-3.18.3/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.18.x/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.18.3/drivers/video/logo/logo_linux_clut224.ppm 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/video/logo/logo_linux_clut224.ppm 2015-01-19 14:27:14.706231516 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -275866,9 +275908,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c ---- linux-3.18.1/drivers/w1/masters/w1-gpio.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/w1/masters/w1-gpio.c 2015-01-09 13:30:04.968124893 -0600 +diff -Nur linux-3.18.3/drivers/w1/masters/w1-gpio.c linux-rpi-3.18.x/drivers/w1/masters/w1-gpio.c +--- linux-3.18.3/drivers/w1/masters/w1-gpio.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/w1/masters/w1-gpio.c 2015-01-19 14:30:17.858226075 +0100 @@ -23,6 +23,15 @@ #include "../w1.h" #include "../w1_int.h" @@ -275968,9 +276010,9 @@ diff -Nur linux-3.18.1/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters return 0; } -diff -Nur linux-3.18.1/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h ---- linux-3.18.1/drivers/w1/w1.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/w1/w1.h 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/w1/w1.h linux-rpi-3.18.x/drivers/w1/w1.h +--- linux-3.18.3/drivers/w1/w1.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/w1/w1.h 2015-01-19 14:30:17.858226075 +0100 @@ -171,6 +171,12 @@ u8 (*set_pullup)(void *, int); @@ -275984,9 +276026,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c ---- linux-3.18.1/drivers/w1/w1_int.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/w1/w1_int.c 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/w1/w1_int.c linux-rpi-3.18.x/drivers/w1/w1_int.c +--- linux-3.18.3/drivers/w1/w1_int.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/w1/w1_int.c 2015-01-19 14:30:17.858226075 +0100 @@ -123,6 +123,20 @@ return(-EINVAL); } @@ -276008,9 +276050,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c ---- linux-3.18.1/drivers/w1/w1_io.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/w1/w1_io.c 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/w1/w1_io.c linux-rpi-3.18.x/drivers/w1/w1_io.c +--- linux-3.18.3/drivers/w1/w1_io.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/w1/w1_io.c 2015-01-19 14:30:17.858226075 +0100 @@ -134,10 +134,22 @@ static void w1_post_write(struct w1_master *dev) { @@ -276037,9 +276079,9 @@ diff -Nur linux-3.18.1/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -diff -Nur linux-3.18.1/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c ---- linux-3.18.1/drivers/watchdog/bcm2708_wdog.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.18.x/drivers/watchdog/bcm2708_wdog.c +--- linux-3.18.3/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/watchdog/bcm2708_wdog.c 2015-01-19 14:30:17.862226075 +0100 @@ -0,0 +1,382 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -276423,9 +276465,9 @@ diff -Nur linux-3.18.1/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.18.1/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig ---- linux-3.18.1/drivers/watchdog/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/watchdog/Kconfig 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/watchdog/Kconfig linux-rpi-3.18.x/drivers/watchdog/Kconfig +--- linux-3.18.3/drivers/watchdog/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/watchdog/Kconfig 2015-01-19 14:30:17.862226075 +0100 @@ -452,6 +452,12 @@ To compile this driver as a module, choose M here: the module will be called retu_wdt. @@ -276439,9 +276481,9 @@ diff -Nur linux-3.18.1/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconf config MOXART_WDT tristate "MOXART watchdog" depends on ARCH_MOXART -diff -Nur linux-3.18.1/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile ---- linux-3.18.1/drivers/watchdog/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/drivers/watchdog/Makefile 2015-01-09 13:30:04.972124893 -0600 +diff -Nur linux-3.18.3/drivers/watchdog/Makefile linux-rpi-3.18.x/drivers/watchdog/Makefile +--- linux-3.18.3/drivers/watchdog/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/drivers/watchdog/Makefile 2015-01-19 14:30:17.862226075 +0100 @@ -56,6 +56,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o @@ -276450,571 +276492,9 @@ diff -Nur linux-3.18.1/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.18.1/.git/config linux-rpi/.git/config ---- linux-3.18.1/.git/config 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/config 2015-01-09 12:27:19.516159366 -0600 -@@ -0,0 +1,11 @@ -+[core] -+ repositoryformatversion = 0 -+ filemode = true -+ bare = false -+ logallrefupdates = true -+[remote "origin"] -+ fetch = +refs/heads/*:refs/remotes/origin/* -+ url = https://github.com/raspberrypi/linux.git -+[branch "rpi-3.12.y"] -+ remote = origin -+ merge = refs/heads/rpi-3.12.y -diff -Nur linux-3.18.1/.git/description linux-rpi/.git/description ---- linux-3.18.1/.git/description 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/description 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1 @@ -+Unnamed repository; edit this file 'description' to name the repository. -diff -Nur linux-3.18.1/.git/HEAD linux-rpi/.git/HEAD ---- linux-3.18.1/.git/HEAD 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/HEAD 2015-01-09 13:30:06.064124883 -0600 -@@ -0,0 +1 @@ -+b9c9f8fc69aaba236169798c18dc1590fccf7acd -diff -Nur linux-3.18.1/.git/hooks/applypatch-msg.sample linux-rpi/.git/hooks/applypatch-msg.sample ---- linux-3.18.1/.git/hooks/applypatch-msg.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/applypatch-msg.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,15 @@ -+#!/bin/sh -+# -+# An example hook script to check the commit log message taken by -+# applypatch from an e-mail message. -+# -+# The hook should exit with non-zero status after issuing an -+# appropriate message if it wants to stop the commit. The hook is -+# allowed to edit the commit message file. -+# -+# To enable this hook, rename this file to "applypatch-msg". -+ -+. git-sh-setup -+test -x "$GIT_DIR/hooks/commit-msg" && -+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -+: -diff -Nur linux-3.18.1/.git/hooks/commit-msg.sample linux-rpi/.git/hooks/commit-msg.sample ---- linux-3.18.1/.git/hooks/commit-msg.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/commit-msg.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,24 @@ -+#!/bin/sh -+# -+# An example hook script to check the commit log message. -+# Called by "git commit" with one argument, the name of the file -+# that has the commit message. The hook should exit with non-zero -+# status after issuing an appropriate message if it wants to stop the -+# commit. The hook is allowed to edit the commit message file. -+# -+# To enable this hook, rename this file to "commit-msg". -+ -+# Uncomment the below to add a Signed-off-by line to the message. -+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -+# hook is more suited to it. -+# -+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" -+ -+# This example catches duplicate Signed-off-by lines. -+ -+test "" = "$(grep '^Signed-off-by: ' "$1" | -+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { -+ echo >&2 Duplicate Signed-off-by lines. -+ exit 1 -+} -diff -Nur linux-3.18.1/.git/hooks/post-update.sample linux-rpi/.git/hooks/post-update.sample ---- linux-3.18.1/.git/hooks/post-update.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/post-update.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,8 @@ -+#!/bin/sh -+# -+# An example hook script to prepare a packed repository for use over -+# dumb transports. -+# -+# To enable this hook, rename this file to "post-update". -+ -+exec git update-server-info -diff -Nur linux-3.18.1/.git/hooks/pre-applypatch.sample linux-rpi/.git/hooks/pre-applypatch.sample ---- linux-3.18.1/.git/hooks/pre-applypatch.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/pre-applypatch.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,14 @@ -+#!/bin/sh -+# -+# An example hook script to verify what is about to be committed -+# by applypatch from an e-mail message. -+# -+# The hook should exit with non-zero status after issuing an -+# appropriate message if it wants to stop the commit. -+# -+# To enable this hook, rename this file to "pre-applypatch". -+ -+. git-sh-setup -+test -x "$GIT_DIR/hooks/pre-commit" && -+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -+: -diff -Nur linux-3.18.1/.git/hooks/pre-commit.sample linux-rpi/.git/hooks/pre-commit.sample ---- linux-3.18.1/.git/hooks/pre-commit.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/pre-commit.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,50 @@ -+#!/bin/sh -+# -+# An example hook script to verify what is about to be committed. -+# Called by "git commit" with no arguments. The hook should -+# exit with non-zero status after issuing an appropriate message if -+# it wants to stop the commit. -+# -+# To enable this hook, rename this file to "pre-commit". -+ -+if git rev-parse --verify HEAD >/dev/null 2>&1 -+then -+ against=HEAD -+else -+ # Initial commit: diff against an empty tree object -+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -+fi -+ -+# If you want to allow non-ascii filenames set this variable to true. -+allownonascii=$(git config hooks.allownonascii) -+ -+# Redirect output to stderr. -+exec 1>&2 -+ -+# Cross platform projects tend to avoid non-ascii filenames; prevent -+# them from being added to the repository. We exploit the fact that the -+# printable range starts at the space character and ends with tilde. -+if [ "$allownonascii" != "true" ] && -+ # Note that the use of brackets around a tr range is ok here, (it's -+ # even required, for portability to Solaris 10's /usr/bin/tr), since -+ # the square bracket bytes happen to fall in the designated range. -+ test $(git diff --cached --name-only --diff-filter=A -z $against | -+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -+then -+ echo "Error: Attempt to add a non-ascii file name." -+ echo -+ echo "This can cause problems if you want to work" -+ echo "with people on other platforms." -+ echo -+ echo "To be portable it is advisable to rename the file ..." -+ echo -+ echo "If you know what you are doing you can disable this" -+ echo "check using:" -+ echo -+ echo " git config hooks.allownonascii true" -+ echo -+ exit 1 -+fi -+ -+# If there are whitespace errors, print the offending file names and fail. -+exec git diff-index --check --cached $against -- -diff -Nur linux-3.18.1/.git/hooks/prepare-commit-msg.sample linux-rpi/.git/hooks/prepare-commit-msg.sample ---- linux-3.18.1/.git/hooks/prepare-commit-msg.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/prepare-commit-msg.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,36 @@ -+#!/bin/sh -+# -+# An example hook script to prepare the commit log message. -+# Called by "git commit" with the name of the file that has the -+# commit message, followed by the description of the commit -+# message's source. The hook's purpose is to edit the commit -+# message file. If the hook fails with a non-zero status, -+# the commit is aborted. -+# -+# To enable this hook, rename this file to "prepare-commit-msg". -+ -+# This hook includes three examples. The first comments out the -+# "Conflicts:" part of a merge commit. -+# -+# The second includes the output of "git diff --name-status -r" -+# into the message, just before the "git status" output. It is -+# commented because it doesn't cope with --amend or with squashed -+# commits. -+# -+# The third example adds a Signed-off-by line to the message, that can -+# still be edited. This is rarely a good idea. -+ -+case "$2,$3" in -+ merge,) -+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; -+ -+# ,|template,) -+# /usr/bin/perl -i.bak -pe ' -+# print "\n" . `git diff --cached --name-status -r` -+# if /^#/ && $first++ == 0' "$1" ;; -+ -+ *) ;; -+esac -+ -+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" -diff -Nur linux-3.18.1/.git/hooks/pre-rebase.sample linux-rpi/.git/hooks/pre-rebase.sample ---- linux-3.18.1/.git/hooks/pre-rebase.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/pre-rebase.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,169 @@ -+#!/bin/sh -+# -+# Copyright (c) 2006, 2008 Junio C Hamano -+# -+# The "pre-rebase" hook is run just before "git rebase" starts doing -+# its job, and can prevent the command from running by exiting with -+# non-zero status. -+# -+# The hook is called with the following parameters: -+# -+# $1 -- the upstream the series was forked from. -+# $2 -- the branch being rebased (or empty when rebasing the current branch). -+# -+# This sample shows how to prevent topic branches that are already -+# merged to 'next' branch from getting rebased, because allowing it -+# would result in rebasing already published history. -+ -+publish=next -+basebranch="$1" -+if test "$#" = 2 -+then -+ topic="refs/heads/$2" -+else -+ topic=`git symbolic-ref HEAD` || -+ exit 0 ;# we do not interrupt rebasing detached HEAD -+fi -+ -+case "$topic" in -+refs/heads/??/*) -+ ;; -+*) -+ exit 0 ;# we do not interrupt others. -+ ;; -+esac -+ -+# Now we are dealing with a topic branch being rebased -+# on top of master. Is it OK to rebase it? -+ -+# Does the topic really exist? -+git show-ref -q "$topic" || { -+ echo >&2 "No such branch $topic" -+ exit 1 -+} -+ -+# Is topic fully merged to master? -+not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -+if test -z "$not_in_master" -+then -+ echo >&2 "$topic is fully merged to master; better remove it." -+ exit 1 ;# we could allow it, but there is no point. -+fi -+ -+# Is topic ever merged to next? If so you should not be rebasing it. -+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -+only_next_2=`git rev-list ^master ${publish} | sort` -+if test "$only_next_1" = "$only_next_2" -+then -+ not_in_topic=`git rev-list "^$topic" master` -+ if test -z "$not_in_topic" -+ then -+ echo >&2 "$topic is already up-to-date with master" -+ exit 1 ;# we could allow it, but there is no point. -+ else -+ exit 0 -+ fi -+else -+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` -+ /usr/bin/perl -e ' -+ my $topic = $ARGV[0]; -+ my $msg = "* $topic has commits already merged to public branch:\n"; -+ my (%not_in_next) = map { -+ /^([0-9a-f]+) /; -+ ($1 => 1); -+ } split(/\n/, $ARGV[1]); -+ for my $elem (map { -+ /^([0-9a-f]+) (.*)$/; -+ [$1 => $2]; -+ } split(/\n/, $ARGV[2])) { -+ if (!exists $not_in_next{$elem->[0]}) { -+ if ($msg) { -+ print STDERR $msg; -+ undef $msg; -+ } -+ print STDERR " $elem->[1]\n"; -+ } -+ } -+ ' "$topic" "$not_in_next" "$not_in_master" -+ exit 1 -+fi -+ -+<<\DOC_END -+ -+This sample hook safeguards topic branches that have been -+published from being rewound. -+ -+The workflow assumed here is: -+ -+ * Once a topic branch forks from "master", "master" is never -+ merged into it again (either directly or indirectly). -+ -+ * Once a topic branch is fully cooked and merged into "master", -+ it is deleted. If you need to build on top of it to correct -+ earlier mistakes, a new topic branch is created by forking at -+ the tip of the "master". This is not strictly necessary, but -+ it makes it easier to keep your history simple. -+ -+ * Whenever you need to test or publish your changes to topic -+ branches, merge them into "next" branch. -+ -+The script, being an example, hardcodes the publish branch name -+to be "next", but it is trivial to make it configurable via -+$GIT_DIR/config mechanism. -+ -+With this workflow, you would want to know: -+ -+(1) ... if a topic branch has ever been merged to "next". Young -+ topic branches can have stupid mistakes you would rather -+ clean up before publishing, and things that have not been -+ merged into other branches can be easily rebased without -+ affecting other people. But once it is published, you would -+ not want to rewind it. -+ -+(2) ... if a topic branch has been fully merged to "master". -+ Then you can delete it. More importantly, you should not -+ build on top of it -- other people may already want to -+ change things related to the topic as patches against your -+ "master", so if you need further changes, it is better to -+ fork the topic (perhaps with the same name) afresh from the -+ tip of "master". -+ -+Let's look at this example: -+ -+ o---o---o---o---o---o---o---o---o---o "next" -+ / / / / -+ / a---a---b A / / -+ / / / / -+ / / c---c---c---c B / -+ / / / \ / -+ / / / b---b C \ / -+ / / / / \ / -+ ---o---o---o---o---o---o---o---o---o---o---o "master" -+ -+ -+A, B and C are topic branches. -+ -+ * A has one fix since it was merged up to "next". -+ -+ * B has finished. It has been fully merged up to "master" and "next", -+ and is ready to be deleted. -+ -+ * C has not merged to "next" at all. -+ -+We would want to allow C to be rebased, refuse A, and encourage -+B to be deleted. -+ -+To compute (1): -+ -+ git rev-list ^master ^topic next -+ git rev-list ^master next -+ -+ if these match, topic has not merged in next at all. -+ -+To compute (2): -+ -+ git rev-list master..topic -+ -+ if this is empty, it is fully merged to "master". -+ -+DOC_END -diff -Nur linux-3.18.1/.git/hooks/update.sample linux-rpi/.git/hooks/update.sample ---- linux-3.18.1/.git/hooks/update.sample 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/hooks/update.sample 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,128 @@ -+#!/bin/sh -+# -+# An example hook script to blocks unannotated tags from entering. -+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -+# -+# To enable this hook, rename this file to "update". -+# -+# Config -+# ------ -+# hooks.allowunannotated -+# This boolean sets whether unannotated tags will be allowed into the -+# repository. By default they won't be. -+# hooks.allowdeletetag -+# This boolean sets whether deleting tags will be allowed in the -+# repository. By default they won't be. -+# hooks.allowmodifytag -+# This boolean sets whether a tag may be modified after creation. By default -+# it won't be. -+# hooks.allowdeletebranch -+# This boolean sets whether deleting branches will be allowed in the -+# repository. By default they won't be. -+# hooks.denycreatebranch -+# This boolean sets whether remotely creating branches will be denied -+# in the repository. By default this is allowed. -+# -+ -+# --- Command line -+refname="$1" -+oldrev="$2" -+newrev="$3" -+ -+# --- Safety check -+if [ -z "$GIT_DIR" ]; then -+ echo "Don't run this script from the command line." >&2 -+ echo " (if you want, you could supply GIT_DIR then run" >&2 -+ echo " $0 <ref> <oldrev> <newrev>)" >&2 -+ exit 1 -+fi -+ -+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then -+ echo "Usage: $0 <ref> <oldrev> <newrev>" >&2 -+ exit 1 -+fi -+ -+# --- Config -+allowunannotated=$(git config --bool hooks.allowunannotated) -+allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -+denycreatebranch=$(git config --bool hooks.denycreatebranch) -+allowdeletetag=$(git config --bool hooks.allowdeletetag) -+allowmodifytag=$(git config --bool hooks.allowmodifytag) -+ -+# check for no description -+projectdesc=$(sed -e '1q' "$GIT_DIR/description") -+case "$projectdesc" in -+"Unnamed repository"* | "") -+ echo "*** Project description file hasn't been set" >&2 -+ exit 1 -+ ;; -+esac -+ -+# --- Check types -+# if $newrev is 0000...0000, it's a commit to delete a ref. -+zero="0000000000000000000000000000000000000000" -+if [ "$newrev" = "$zero" ]; then -+ newrev_type=delete -+else -+ newrev_type=$(git cat-file -t $newrev) -+fi -+ -+case "$refname","$newrev_type" in -+ refs/tags/*,commit) -+ # un-annotated tag -+ short_refname=${refname##refs/tags/} -+ if [ "$allowunannotated" != "true" ]; then -+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 -+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 -+ exit 1 -+ fi -+ ;; -+ refs/tags/*,delete) -+ # delete tag -+ if [ "$allowdeletetag" != "true" ]; then -+ echo "*** Deleting a tag is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/tags/*,tag) -+ # annotated tag -+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 -+ then -+ echo "*** Tag '$refname' already exists." >&2 -+ echo "*** Modifying a tag is not allowed in this repository." >&2 -+ exit 1 -+ fi -+ ;; -+ refs/heads/*,commit) -+ # branch -+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then -+ echo "*** Creating a branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/heads/*,delete) -+ # delete branch -+ if [ "$allowdeletebranch" != "true" ]; then -+ echo "*** Deleting a branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/remotes/*,commit) -+ # tracking branch -+ ;; -+ refs/remotes/*,delete) -+ # delete tracking branch -+ if [ "$allowdeletebranch" != "true" ]; then -+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ *) -+ # Anything else (is there anything else?) -+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 -+ exit 1 -+ ;; -+esac -+ -+# --- Finished -+exit 0 -Binary files linux-3.18.1/.git/index and linux-rpi/.git/index differ -diff -Nur linux-3.18.1/.git/info/exclude linux-rpi/.git/info/exclude ---- linux-3.18.1/.git/info/exclude 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/info/exclude 2015-01-09 12:17:00.544165033 -0600 -@@ -0,0 +1,6 @@ -+# git ls-files --others --exclude-from=.git/info/exclude -+# Lines that start with '#' are comments. -+# For a project mostly in C, the following would be a good set of -+# exclude patterns (uncomment them if you want to use them): -+# *.[oa] -+# *~ -diff -Nur linux-3.18.1/.git/logs/HEAD linux-rpi/.git/logs/HEAD ---- linux-3.18.1/.git/logs/HEAD 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/logs/HEAD 2015-01-09 13:30:06.064124883 -0600 -@@ -0,0 +1,2 @@ -+0000000000000000000000000000000000000000 3eae23e90df575520c36ce9e5eec15ba25945973 Waldemar Brodkorb <wbx@openadk.org> 1420828039 -0600 clone: from https://github.com/raspberrypi/linux.git -+3eae23e90df575520c36ce9e5eec15ba25945973 b9c9f8fc69aaba236169798c18dc1590fccf7acd Waldemar Brodkorb <wbx@openadk.org> 1420831806 -0600 checkout: moving from rpi-3.12.y to origin/rpi-3.18.y -diff -Nur linux-3.18.1/.git/logs/refs/heads/rpi-3.12.y linux-rpi/.git/logs/refs/heads/rpi-3.12.y ---- linux-3.18.1/.git/logs/refs/heads/rpi-3.12.y 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/logs/refs/heads/rpi-3.12.y 2015-01-09 12:27:19.516159366 -0600 -@@ -0,0 +1 @@ -+0000000000000000000000000000000000000000 3eae23e90df575520c36ce9e5eec15ba25945973 Waldemar Brodkorb <wbx@openadk.org> 1420828039 -0600 clone: from https://github.com/raspberrypi/linux.git -diff -Nur linux-3.18.1/.git/logs/refs/remotes/origin/HEAD linux-rpi/.git/logs/refs/remotes/origin/HEAD ---- linux-3.18.1/.git/logs/refs/remotes/origin/HEAD 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/logs/refs/remotes/origin/HEAD 2015-01-09 12:27:19.516159366 -0600 -@@ -0,0 +1 @@ -+0000000000000000000000000000000000000000 3eae23e90df575520c36ce9e5eec15ba25945973 Waldemar Brodkorb <wbx@openadk.org> 1420828039 -0600 clone: from https://github.com/raspberrypi/linux.git -Binary files linux-3.18.1/.git/objects/pack/pack-23f83a651d7f7d5b5ddaea43befb4471753a37db.idx and linux-rpi/.git/objects/pack/pack-23f83a651d7f7d5b5ddaea43befb4471753a37db.idx differ -Binary files linux-3.18.1/.git/objects/pack/pack-23f83a651d7f7d5b5ddaea43befb4471753a37db.pack and linux-rpi/.git/objects/pack/pack-23f83a651d7f7d5b5ddaea43befb4471753a37db.pack differ -diff -Nur linux-3.18.1/.git/packed-refs linux-rpi/.git/packed-refs ---- linux-3.18.1/.git/packed-refs 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/packed-refs 2015-01-09 12:27:19.476159369 -0600 -@@ -0,0 +1,18 @@ -+# pack-refs with: peeled -+645fd9b0c0b3c1f79f71f92dac79bd2f87010444 refs/remotes/origin/master -+1b49b450222df26e4abf7abb6d9302f72b2ed386 refs/remotes/origin/rpi-3.10.y -+d894df614c20e2f56ce0ff0576a4c517352684de refs/remotes/origin/rpi-3.10.y-next -+8f768c5f2a3314e4eacce8d667c787f8dadfda74 refs/remotes/origin/rpi-3.11.y -+3eae23e90df575520c36ce9e5eec15ba25945973 refs/remotes/origin/rpi-3.12.y -+a26c4d1f1428082f6aba79207535527c91115c76 refs/remotes/origin/rpi-3.13.y -+2514e943096ff51dd5a83b28b4b4d45ec2693434 refs/remotes/origin/rpi-3.13.y-next -+efa58ca2948bcfeb0db62e3ba863490b37ae25fd refs/remotes/origin/rpi-3.14.y -+8812404b672364ee794411ed19080dc9b6287682 refs/remotes/origin/rpi-3.15.y -+377c82aa1d31b37f1096096b0e4c65beb0bc5c49 refs/remotes/origin/rpi-3.16.y -+5f1c1ee8aca1f9c69b0e65bcd21065552d271013 refs/remotes/origin/rpi-3.17.y -+b9c9f8fc69aaba236169798c18dc1590fccf7acd refs/remotes/origin/rpi-3.18.y -+ada8b4415ff44d535d63e4291a0eca733bc2ad0f refs/remotes/origin/rpi-3.2.27 -+2a8d45ec0883e3cbdce920855b3461ac77308a5f refs/remotes/origin/rpi-3.6.y -+d996a1b91b2bf3dc06f4f4f822a56f4496457aa1 refs/remotes/origin/rpi-3.8.y -+d5572370289f698b101f3d0198b1c99f17f0d278 refs/remotes/origin/rpi-3.9.y -+8fa2e19c4fdbe17704947e444674e19ea47c8ddd refs/remotes/origin/rpi-patches -diff -Nur linux-3.18.1/.git/refs/heads/rpi-3.12.y linux-rpi/.git/refs/heads/rpi-3.12.y ---- linux-3.18.1/.git/refs/heads/rpi-3.12.y 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/refs/heads/rpi-3.12.y 2015-01-09 12:27:19.516159366 -0600 -@@ -0,0 +1 @@ -+3eae23e90df575520c36ce9e5eec15ba25945973 -diff -Nur linux-3.18.1/.git/refs/remotes/origin/HEAD linux-rpi/.git/refs/remotes/origin/HEAD ---- linux-3.18.1/.git/refs/remotes/origin/HEAD 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/.git/refs/remotes/origin/HEAD 2015-01-09 12:27:19.516159366 -0600 -@@ -0,0 +1 @@ -+ref: refs/remotes/origin/rpi-3.12.y -diff -Nur linux-3.18.1/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h ---- linux-3.18.1/include/linux/broadcom/vc_cma.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/include/linux/broadcom/vc_cma.h 2015-01-09 12:27:24.264159324 -0600 +diff -Nur linux-3.18.3/include/linux/broadcom/vc_cma.h linux-rpi-3.18.x/include/linux/broadcom/vc_cma.h +--- linux-3.18.3/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/include/linux/broadcom/vc_cma.h 2015-01-19 14:27:14.974231508 +0100 @@ -0,0 +1,29 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -277045,9 +276525,9 @@ diff -Nur linux-3.18.1/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/b +#endif + +#endif /* VC_CMA_H */ -diff -Nur linux-3.18.1/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h ---- linux-3.18.1/include/linux/mmc/host.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/include/linux/mmc/host.h 2015-01-09 13:30:05.320124890 -0600 +diff -Nur linux-3.18.3/include/linux/mmc/host.h linux-rpi-3.18.x/include/linux/mmc/host.h +--- linux-3.18.3/include/linux/mmc/host.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/include/linux/mmc/host.h 2015-01-19 14:30:18.062226069 +0100 @@ -290,6 +290,7 @@ #define MMC_CAP2_HS400 (MMC_CAP2_HS400_1_8V | \ MMC_CAP2_HS400_1_2V) @@ -277056,9 +276536,9 @@ diff -Nur linux-3.18.1/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host mmc_pm_flag_t pm_caps; /* supported pm features */ -diff -Nur linux-3.18.1/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h ---- linux-3.18.1/include/linux/mmc/sdhci.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/include/linux/mmc/sdhci.h 2015-01-09 13:30:05.320124890 -0600 +diff -Nur linux-3.18.3/include/linux/mmc/sdhci.h linux-rpi-3.18.x/include/linux/mmc/sdhci.h +--- linux-3.18.3/include/linux/mmc/sdhci.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/include/linux/mmc/sdhci.h 2015-01-19 14:30:18.062226069 +0100 @@ -130,6 +130,7 @@ #define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ #define SDHCI_SDR104_NEEDS_TUNING (1<<10) /* SDR104/HS200 needs tuning */ @@ -277067,9 +276547,9 @@ diff -Nur linux-3.18.1/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdh unsigned int version; /* SDHCI spec. version */ -diff -Nur linux-3.18.1/include/linux/platform_data/bcm2708.h linux-rpi/include/linux/platform_data/bcm2708.h ---- linux-3.18.1/include/linux/platform_data/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/include/linux/platform_data/bcm2708.h 2015-01-09 12:27:24.340159322 -0600 +diff -Nur linux-3.18.3/include/linux/platform_data/bcm2708.h linux-rpi-3.18.x/include/linux/platform_data/bcm2708.h +--- linux-3.18.3/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/include/linux/platform_data/bcm2708.h 2015-01-19 14:27:15.026231507 +0100 @@ -0,0 +1,23 @@ +/* + * include/linux/platform_data/bcm2708.h @@ -277094,9 +276574,9 @@ diff -Nur linux-3.18.1/include/linux/platform_data/bcm2708.h linux-rpi/include/l + bcm2708_gpio_pull_t value); + +#endif -diff -Nur linux-3.18.1/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h ---- linux-3.18.1/include/linux/vmstat.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/include/linux/vmstat.h 2015-01-09 13:30:05.360124888 -0600 +diff -Nur linux-3.18.3/include/linux/vmstat.h linux-rpi-3.18.x/include/linux/vmstat.h +--- linux-3.18.3/include/linux/vmstat.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/include/linux/vmstat.h 2015-01-19 14:30:18.086226068 +0100 @@ -241,7 +241,11 @@ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -277109,9 +276589,9 @@ diff -Nur linux-3.18.1/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h } static inline void __inc_zone_page_state(struct page *page, -diff -Nur linux-3.18.1/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h ---- linux-3.18.1/include/uapi/linux/fb.h 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/include/uapi/linux/fb.h 2015-01-09 12:27:24.476159322 -0600 +diff -Nur linux-3.18.3/include/uapi/linux/fb.h linux-rpi-3.18.x/include/uapi/linux/fb.h +--- linux-3.18.3/include/uapi/linux/fb.h 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/include/uapi/linux/fb.h 2015-01-19 14:27:15.094231505 +0100 @@ -34,6 +34,11 @@ #define FBIOPUT_MODEINFO 0x4617 #define FBIOGET_DISPINFO 0x4618 @@ -277124,9 +276604,9 @@ diff -Nur linux-3.18.1/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.18.1/kernel/cgroup.c linux-rpi/kernel/cgroup.c ---- linux-3.18.1/kernel/cgroup.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/kernel/cgroup.c 2015-01-09 13:30:05.448124889 -0600 +diff -Nur linux-3.18.3/kernel/cgroup.c linux-rpi-3.18.x/kernel/cgroup.c +--- linux-3.18.3/kernel/cgroup.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/kernel/cgroup.c 2015-01-19 14:30:18.130226067 +0100 @@ -5322,6 +5322,29 @@ } __setup("cgroup_disable=", cgroup_disable); @@ -277157,9 +276637,9 @@ diff -Nur linux-3.18.1/kernel/cgroup.c linux-rpi/kernel/cgroup.c static int __init cgroup_set_legacy_files_on_dfl(char *str) { printk("cgroup: using legacy files on the default hierarchy\n"); -diff -Nur linux-3.18.1/mm/memcontrol.c linux-rpi/mm/memcontrol.c ---- linux-3.18.1/mm/memcontrol.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/mm/memcontrol.c 2015-01-09 13:30:05.512124888 -0600 +diff -Nur linux-3.18.3/mm/memcontrol.c linux-rpi-3.18.x/mm/memcontrol.c +--- linux-3.18.3/mm/memcontrol.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/mm/memcontrol.c 2015-01-19 14:30:18.174226066 +0100 @@ -6207,6 +6207,7 @@ .bind = mem_cgroup_bind, .legacy_cftypes = mem_cgroup_files, @@ -277168,9 +276648,9 @@ diff -Nur linux-3.18.1/mm/memcontrol.c linux-rpi/mm/memcontrol.c }; #ifdef CONFIG_MEMCG_SWAP -diff -Nur linux-3.18.1/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c ---- linux-3.18.1/sound/arm/bcm2835.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/bcm2835.c 2015-01-09 13:30:05.740124886 -0600 +diff -Nur linux-3.18.3/sound/arm/bcm2835.c linux-rpi-3.18.x/sound/arm/bcm2835.c +--- linux-3.18.3/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/bcm2835.c 2015-01-19 14:30:18.314226061 +0100 @@ -0,0 +1,420 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -277592,9 +277072,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c ---- linux-3.18.1/sound/arm/bcm2835-ctl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/bcm2835-ctl.c 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/bcm2835-ctl.c linux-rpi-3.18.x/sound/arm/bcm2835-ctl.c +--- linux-3.18.3/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/bcm2835-ctl.c 2015-01-19 14:27:15.334231498 +0100 @@ -0,0 +1,323 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -277919,9 +277399,9 @@ diff -Nur linux-3.18.1/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c + } + return 0; +} -diff -Nur linux-3.18.1/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h ---- linux-3.18.1/sound/arm/bcm2835.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/bcm2835.h 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/bcm2835.h linux-rpi-3.18.x/sound/arm/bcm2835.h +--- linux-3.18.3/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/bcm2835.h 2015-01-19 14:27:15.334231498 +0100 @@ -0,0 +1,167 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -278090,9 +277570,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c ---- linux-3.18.1/sound/arm/bcm2835-pcm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/bcm2835-pcm.c 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/bcm2835-pcm.c linux-rpi-3.18.x/sound/arm/bcm2835-pcm.c +--- linux-3.18.3/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/bcm2835-pcm.c 2015-01-19 14:27:15.334231498 +0100 @@ -0,0 +1,552 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -278646,9 +278126,9 @@ diff -Nur linux-3.18.1/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c + + return 0; +} -diff -Nur linux-3.18.1/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c ---- linux-3.18.1/sound/arm/bcm2835-vchiq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/bcm2835-vchiq.c 2015-01-09 13:30:05.736124886 -0600 +diff -Nur linux-3.18.3/sound/arm/bcm2835-vchiq.c linux-rpi-3.18.x/sound/arm/bcm2835-vchiq.c +--- linux-3.18.3/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/bcm2835-vchiq.c 2015-01-19 14:30:18.314226061 +0100 @@ -0,0 +1,902 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -279552,9 +279032,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig ---- linux-3.18.1/sound/arm/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/arm/Kconfig 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/Kconfig linux-rpi-3.18.x/sound/arm/Kconfig +--- linux-3.18.3/sound/arm/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/Kconfig 2015-01-19 14:27:15.334231498 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -279568,9 +279048,9 @@ diff -Nur linux-3.18.1/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig + endif # SND_ARM -diff -Nur linux-3.18.1/sound/arm/Makefile linux-rpi/sound/arm/Makefile ---- linux-3.18.1/sound/arm/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/arm/Makefile 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/Makefile linux-rpi-3.18.x/sound/arm/Makefile +--- linux-3.18.3/sound/arm/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/Makefile 2015-01-19 14:27:15.334231498 +0100 @@ -14,3 +14,8 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -279580,9 +279060,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.18.1/sound/arm/vc_vchi_audioserv_defs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2015-01-09 12:27:25.096159315 -0600 +diff -Nur linux-3.18.3/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.18.x/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.18.3/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/arm/vc_vchi_audioserv_defs.h 2015-01-19 14:27:15.334231498 +0100 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -279700,9 +279180,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c ---- linux-3.18.1/sound/soc/bcm/bcm2708-i2s.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/bcm2708-i2s.c linux-rpi-3.18.x/sound/soc/bcm/bcm2708-i2s.c +--- linux-3.18.3/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/bcm2708-i2s.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,1009 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC @@ -280713,9 +280193,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm2708-i2s.h ---- linux-3.18.1/sound/soc/bcm/bcm2708-i2s.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.h 2015-01-09 12:27:25.192159314 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/bcm2708-i2s.h linux-rpi-3.18.x/sound/soc/bcm/bcm2708-i2s.h +--- linux-3.18.3/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/bcm2708-i2s.h 2015-01-19 14:27:15.406231496 +0100 @@ -0,0 +1,35 @@ +/* + * I2S configuration for sound cards. @@ -280752,9 +280232,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm27 +extern void bcm2708_i2s_set_gpio(int gpio); + +#endif -diff -Nur linux-3.18.1/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm2835-i2s.c ---- linux-3.18.1/sound/soc/bcm/bcm2835-i2s.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/bcm2835-i2s.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/bcm2835-i2s.c linux-rpi-3.18.x/sound/soc/bcm/bcm2835-i2s.c +--- linux-3.18.3/sound/soc/bcm/bcm2835-i2s.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/bcm2835-i2s.c 2015-01-19 14:30:18.366226060 +0100 @@ -861,6 +861,7 @@ { .compatible = "brcm,bcm2835-i2s", }, {}, @@ -280763,9 +280243,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm28 static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, -diff -Nur linux-3.18.1/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hifiberry_amp.c ---- linux-3.18.1/sound/soc/bcm/hifiberry_amp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/hifiberry_amp.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_amp.c linux-rpi-3.18.x/sound/soc/bcm/hifiberry_amp.c +--- linux-3.18.3/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/hifiberry_amp.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,106 @@ +/* + * ASoC Driver for HifiBerry AMP @@ -280873,9 +280353,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for HiFiBerry-AMP"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.1/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c ---- linux-3.18.1/sound/soc/bcm/hifiberry_dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_dac.c linux-rpi-3.18.x/sound/soc/bcm/hifiberry_dac.c +--- linux-3.18.3/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/hifiberry_dac.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,122 @@ +/* + * ASoC Driver for HifiBerry DAC @@ -280999,9 +280479,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm/hifiberry_dacplus.c ---- linux-3.18.1/sound/soc/bcm/hifiberry_dacplus.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/hifiberry_dacplus.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_dacplus.c linux-rpi-3.18.x/sound/soc/bcm/hifiberry_dacplus.c +--- linux-3.18.3/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/hifiberry_dacplus.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,141 @@ +/* + * ASoC Driver for HiFiBerry DAC+ @@ -281144,9 +280624,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>"); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.1/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c ---- linux-3.18.1/sound/soc/bcm/hifiberry_digi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc/bcm/hifiberry_digi.c +--- linux-3.18.3/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/hifiberry_digi.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,175 @@ +/* + * ASoC Driver for HifiBerry Digi @@ -281323,9 +280803,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c ---- linux-3.18.1/sound/soc/bcm/iqaudio-dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/iqaudio-dac.c linux-rpi-3.18.x/sound/soc/bcm/iqaudio-dac.c +--- linux-3.18.3/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/iqaudio-dac.c 2015-01-19 14:30:18.366226060 +0100 @@ -0,0 +1,127 @@ +/* + * ASoC Driver for IQaudIO DAC @@ -281454,9 +280934,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig ---- linux-3.18.1/sound/soc/bcm/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/Kconfig 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/Kconfig linux-rpi-3.18.x/sound/soc/bcm/Kconfig +--- linux-3.18.3/sound/soc/bcm/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/Kconfig 2015-01-19 14:30:18.366226060 +0100 @@ -7,3 +7,56 @@ Say Y or M if you want to add support for codecs attached to the BCM2835 I2S interface. You will also need @@ -281514,9 +280994,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig + select SND_SOC_PCM512x_I2C + help + Say Y or M if you want to add support for IQaudIO-DAC. -diff -Nur linux-3.18.1/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile ---- linux-3.18.1/sound/soc/bcm/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/Makefile 2015-01-09 13:30:05.816124884 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/Makefile linux-rpi-3.18.x/sound/soc/bcm/Makefile +--- linux-3.18.3/sound/soc/bcm/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/Makefile 2015-01-19 14:30:18.366226060 +0100 @@ -3,3 +3,22 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o @@ -281540,9 +281020,9 @@ diff -Nur linux-3.18.1/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.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.18.1/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c ---- linux-3.18.1/sound/soc/bcm/rpi-dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/bcm/rpi-dac.c 2015-01-09 12:27:25.192159314 -0600 +diff -Nur linux-3.18.3/sound/soc/bcm/rpi-dac.c linux-rpi-3.18.x/sound/soc/bcm/rpi-dac.c +--- linux-3.18.3/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/bcm/rpi-dac.c 2015-01-19 14:27:15.406231496 +0100 @@ -0,0 +1,97 @@ +/* + * ASoC Driver for RPi-DAC. @@ -281641,9 +281121,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig ---- linux-3.18.1/sound/soc/codecs/Kconfig 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/Kconfig 2015-01-09 13:30:05.820124884 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/Kconfig linux-rpi-3.18.x/sound/soc/codecs/Kconfig +--- linux-3.18.3/sound/soc/codecs/Kconfig 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/Kconfig 2015-01-19 14:30:18.366226060 +0100 @@ -80,6 +80,8 @@ select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER @@ -281684,9 +281164,9 @@ diff -Nur linux-3.18.1/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconf config SND_SOC_TLV320AIC23 tristate -diff -Nur linux-3.18.1/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile ---- linux-3.18.1/sound/soc/codecs/Makefile 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/Makefile 2015-01-09 13:30:05.820124884 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/Makefile linux-rpi-3.18.x/sound/soc/codecs/Makefile +--- linux-3.18.3/sound/soc/codecs/Makefile 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/Makefile 2015-01-19 14:30:18.366226060 +0100 @@ -74,6 +74,8 @@ snd-soc-pcm512x-spi-objs := pcm512x-spi.o snd-soc-rl6231-objs := rl6231.o @@ -281721,9 +281201,9 @@ diff -Nur linux-3.18.1/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Make obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o -diff -Nur linux-3.18.1/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c ---- linux-3.18.1/sound/soc/codecs/pcm1794a.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/pcm1794a.c 2015-01-09 12:27:25.208159314 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/pcm1794a.c linux-rpi-3.18.x/sound/soc/codecs/pcm1794a.c +--- linux-3.18.3/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/pcm1794a.c 2015-01-19 14:27:15.414231495 +0100 @@ -0,0 +1,62 @@ +/* + * Driver for the PCM1794A codec @@ -281787,9 +281267,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c ---- linux-3.18.1/sound/soc/codecs/pcm5102a.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/pcm5102a.c 2015-01-09 13:30:05.832124884 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/pcm5102a.c linux-rpi-3.18.x/sound/soc/codecs/pcm5102a.c +--- linux-3.18.3/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/pcm5102a.c 2015-01-19 14:30:18.374226060 +0100 @@ -0,0 +1,70 @@ +/* + * Driver for the PCM5102A codec @@ -281861,9 +281341,9 @@ diff -Nur linux-3.18.1/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.18.1/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c ---- linux-3.18.1/sound/soc/codecs/pcm512x.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/pcm512x.c 2015-01-09 13:30:05.832124884 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/pcm512x.c linux-rpi-3.18.x/sound/soc/codecs/pcm512x.c +--- linux-3.18.3/sound/soc/codecs/pcm512x.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/pcm512x.c 2015-01-19 14:30:18.374226060 +0100 @@ -259,8 +259,8 @@ pcm512x_ramp_step_text); @@ -281875,9 +281355,9 @@ diff -Nur linux-3.18.1/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, -diff -Nur linux-3.18.1/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas5713.c ---- linux-3.18.1/sound/soc/codecs/tas5713.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/tas5713.c 2015-01-09 13:30:05.840124885 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.c linux-rpi-3.18.x/sound/soc/codecs/tas5713.c +--- linux-3.18.3/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/tas5713.c 2015-01-19 14:30:18.382226059 +0100 @@ -0,0 +1,362 @@ +/* + * ASoC Driver for TAS5713 @@ -282241,9 +281721,9 @@ diff -Nur linux-3.18.1/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for TAS5713"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.1/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas5713.h ---- linux-3.18.1/sound/soc/codecs/tas5713.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/tas5713.h 2015-01-09 13:30:05.840124885 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.h linux-rpi-3.18.x/sound/soc/codecs/tas5713.h +--- linux-3.18.3/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/tas5713.h 2015-01-19 14:30:18.382226059 +0100 @@ -0,0 +1,210 @@ +/* + * ASoC Driver for TAS5713 @@ -282455,9 +281935,9 @@ diff -Nur linux-3.18.1/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas + + +#endif /* _TAS5713_H */ -diff -Nur linux-3.18.1/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c ---- linux-3.18.1/sound/soc/codecs/wm8804.c 2014-12-16 11:39:45.000000000 -0600 -+++ linux-rpi/sound/soc/codecs/wm8804.c 2015-01-09 13:30:05.848124885 -0600 +diff -Nur linux-3.18.3/sound/soc/codecs/wm8804.c linux-rpi-3.18.x/sound/soc/codecs/wm8804.c +--- linux-3.18.3/sound/soc/codecs/wm8804.c 2015-01-16 16:04:08.000000000 +0100 ++++ linux-rpi-3.18.x/sound/soc/codecs/wm8804.c 2015-01-19 14:30:18.386226059 +0100 @@ -278,6 +278,7 @@ blen = 0x1; break; diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index b407590e5..3325d6415 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -5,10 +5,10 @@ choice prompt "Kernel Version" depends on ADK_TARGET_KERNEL_CUSTOMISING default ADK_KERNEL_VERSION_3_14_28 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 -default ADK_KERNEL_VERSION_3_18.2 +default ADK_KERNEL_VERSION_3_18.3 -config ADK_KERNEL_VERSION_3_18_2 - prompt "3.18.2" +config ADK_KERNEL_VERSION_3_18_3 + prompt "3.18.3" depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX boolean select ADK_KERNEL_VERSION_3_18 diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default index 1f968c460..fbe402171 100644 --- a/target/config/Config.in.kernelversion.default +++ b/target/config/Config.in.kernelversion.default @@ -18,7 +18,7 @@ config ADK_KERNEL_VERSION_3_4 config ADK_KERNEL_VERSION string - default "3.18.2" if ADK_KERNEL_VERSION_3_18_2 + default "3.18.3" if ADK_KERNEL_VERSION_3_18_3 default "3.14.28" if ADK_KERNEL_VERSION_3_14_28 default "3.12.33" if ADK_KERNEL_VERSION_3_12_33 default "3.10.53" if ADK_KERNEL_VERSION_3_10_53 diff --git a/target/linux/patches/3.18.2/bsd-compatibility.patch b/target/linux/patches/3.18.3/bsd-compatibility.patch index b954b658f..b954b658f 100644 --- a/target/linux/patches/3.18.2/bsd-compatibility.patch +++ b/target/linux/patches/3.18.3/bsd-compatibility.patch diff --git a/target/linux/patches/3.18.2/cleankernel.patch b/target/linux/patches/3.18.3/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/target/linux/patches/3.18.2/cleankernel.patch +++ b/target/linux/patches/3.18.3/cleankernel.patch diff --git a/target/linux/patches/3.18.2/cris-header.patch b/target/linux/patches/3.18.3/cris-header.patch index 3db07e530..3db07e530 100644 --- a/target/linux/patches/3.18.2/cris-header.patch +++ b/target/linux/patches/3.18.3/cris-header.patch diff --git a/target/linux/patches/3.18.2/defaults.patch b/target/linux/patches/3.18.3/defaults.patch index 6cdca084e..6cdca084e 100644 --- a/target/linux/patches/3.18.2/defaults.patch +++ b/target/linux/patches/3.18.3/defaults.patch diff --git a/target/linux/patches/3.18.2/export-symbol-for-exmap.patch b/target/linux/patches/3.18.3/export-symbol-for-exmap.patch index 4f0fc8449..4f0fc8449 100644 --- a/target/linux/patches/3.18.2/export-symbol-for-exmap.patch +++ b/target/linux/patches/3.18.3/export-symbol-for-exmap.patch diff --git a/target/linux/patches/3.18.2/gemalto.patch b/target/linux/patches/3.18.3/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.18.2/gemalto.patch +++ b/target/linux/patches/3.18.3/gemalto.patch diff --git a/target/linux/patches/3.18.2/initramfs-nosizelimit.patch b/target/linux/patches/3.18.3/initramfs-nosizelimit.patch index 40d2f6bd8..40d2f6bd8 100644 --- a/target/linux/patches/3.18.2/initramfs-nosizelimit.patch +++ b/target/linux/patches/3.18.3/initramfs-nosizelimit.patch diff --git a/target/linux/patches/3.18.2/lemote-rfkill.patch b/target/linux/patches/3.18.3/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.18.2/lemote-rfkill.patch +++ b/target/linux/patches/3.18.3/lemote-rfkill.patch diff --git a/target/linux/patches/3.18.2/microblaze-axi.patch b/target/linux/patches/3.18.3/microblaze-axi.patch index 1a4b17d8c..1a4b17d8c 100644 --- a/target/linux/patches/3.18.2/microblaze-axi.patch +++ b/target/linux/patches/3.18.3/microblaze-axi.patch diff --git a/target/linux/patches/3.18.2/microblaze-ethernet.patch b/target/linux/patches/3.18.3/microblaze-ethernet.patch index 742ab477e..742ab477e 100644 --- a/target/linux/patches/3.18.2/microblaze-ethernet.patch +++ b/target/linux/patches/3.18.3/microblaze-ethernet.patch diff --git a/target/linux/patches/3.18.2/mkpiggy.patch b/target/linux/patches/3.18.3/mkpiggy.patch index 751678b74..751678b74 100644 --- a/target/linux/patches/3.18.2/mkpiggy.patch +++ b/target/linux/patches/3.18.3/mkpiggy.patch diff --git a/target/linux/patches/3.18.2/mtd-rootfs.patch b/target/linux/patches/3.18.3/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.18.2/mtd-rootfs.patch +++ b/target/linux/patches/3.18.3/mtd-rootfs.patch diff --git a/target/linux/patches/3.18.2/nfsv3-tcp.patch b/target/linux/patches/3.18.3/nfsv3-tcp.patch index d5e07e1c2..d5e07e1c2 100644 --- a/target/linux/patches/3.18.2/nfsv3-tcp.patch +++ b/target/linux/patches/3.18.3/nfsv3-tcp.patch diff --git a/target/linux/patches/3.18.2/non-static.patch b/target/linux/patches/3.18.3/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.18.2/non-static.patch +++ b/target/linux/patches/3.18.3/non-static.patch diff --git a/target/linux/patches/3.18.2/patch-fblogo b/target/linux/patches/3.18.3/patch-fblogo index f1fad64c1..f1fad64c1 100644 --- a/target/linux/patches/3.18.2/patch-fblogo +++ b/target/linux/patches/3.18.3/patch-fblogo diff --git a/target/linux/patches/3.18.2/patch-yaffs2 b/target/linux/patches/3.18.3/patch-yaffs2 index bb244c7ca..bb244c7ca 100644 --- a/target/linux/patches/3.18.2/patch-yaffs2 +++ b/target/linux/patches/3.18.3/patch-yaffs2 diff --git a/target/linux/patches/3.18.2/ppc64-missing-zlib.patch b/target/linux/patches/3.18.3/ppc64-missing-zlib.patch index c6e0616be..c6e0616be 100644 --- a/target/linux/patches/3.18.2/ppc64-missing-zlib.patch +++ b/target/linux/patches/3.18.3/ppc64-missing-zlib.patch diff --git a/target/linux/patches/3.18.2/relocs.patch b/target/linux/patches/3.18.3/relocs.patch index 69a7c88a9..69a7c88a9 100644 --- a/target/linux/patches/3.18.2/relocs.patch +++ b/target/linux/patches/3.18.3/relocs.patch diff --git a/target/linux/patches/3.18.2/sgidefs.patch b/target/linux/patches/3.18.3/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/target/linux/patches/3.18.2/sgidefs.patch +++ b/target/linux/patches/3.18.3/sgidefs.patch diff --git a/target/linux/patches/3.18.2/sortext.patch b/target/linux/patches/3.18.3/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/target/linux/patches/3.18.2/sortext.patch +++ b/target/linux/patches/3.18.3/sortext.patch diff --git a/target/linux/patches/3.18.2/startup.patch b/target/linux/patches/3.18.3/startup.patch index d396b75e4..d396b75e4 100644 --- a/target/linux/patches/3.18.2/startup.patch +++ b/target/linux/patches/3.18.3/startup.patch diff --git a/target/linux/patches/3.18.2/wlan-cf.patch b/target/linux/patches/3.18.3/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.18.2/wlan-cf.patch +++ b/target/linux/patches/3.18.3/wlan-cf.patch diff --git a/target/linux/patches/3.18.2/xargs.patch b/target/linux/patches/3.18.3/xargs.patch index 2c7b3df59..2c7b3df59 100644 --- a/target/linux/patches/3.18.2/xargs.patch +++ b/target/linux/patches/3.18.3/xargs.patch diff --git a/target/m68k/qemu-m68k/patches/3.18.2/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k/patches/3.18.3/m68k-coldfire-fec.patch index ceaa21ce6..ceaa21ce6 100644 --- a/target/m68k/qemu-m68k/patches/3.18.2/m68k-coldfire-fec.patch +++ b/target/m68k/qemu-m68k/patches/3.18.3/m68k-coldfire-fec.patch diff --git a/target/m68k/qemu-m68k/patches/3.18.2/qemu-coldfire.patch b/target/m68k/qemu-m68k/patches/3.18.3/qemu-coldfire.patch index 14d2f610b..14d2f610b 100644 --- a/target/m68k/qemu-m68k/patches/3.18.2/qemu-coldfire.patch +++ b/target/m68k/qemu-m68k/patches/3.18.3/qemu-coldfire.patch diff --git a/target/mips64/lemote-yeelong/patches/3.18.2/sm7xx-fb.patch b/target/mips64/lemote-yeelong/patches/3.18.3/sm7xx-fb.patch index bcdec83cf..bcdec83cf 100644 --- a/target/mips64/lemote-yeelong/patches/3.18.2/sm7xx-fb.patch +++ b/target/mips64/lemote-yeelong/patches/3.18.3/sm7xx-fb.patch |