summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch)8276
-rw-r--r--target/arm/raspberry-pi/patches/3.18.5/0001-add-support-for-rpi-proto-hardware.patch287
-rw-r--r--target/arm/raspberry-pi/patches/3.18.5/0002-allow-to-control-volume-for-each-channel.patch26
-rw-r--r--target/config/Config.in.kernelversion.choice6
-rw-r--r--target/config/Config.in.kernelversion.default2
-rw-r--r--target/linux/patches/3.18.5/bsd-compatibility.patch (renamed from target/linux/patches/3.18.4/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.18.5/cleankernel.patch (renamed from target/linux/patches/3.18.4/cleankernel.patch)0
-rw-r--r--target/linux/patches/3.18.5/cris-header.patch (renamed from target/linux/patches/3.18.4/cris-header.patch)0
-rw-r--r--target/linux/patches/3.18.5/defaults.patch (renamed from target/linux/patches/3.18.4/defaults.patch)0
-rw-r--r--target/linux/patches/3.18.5/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.18.4/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.18.5/gemalto.patch (renamed from target/linux/patches/3.18.4/gemalto.patch)0
-rw-r--r--target/linux/patches/3.18.5/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.18.4/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.18.5/lemote-rfkill.patch (renamed from target/linux/patches/3.18.4/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.18.5/microblaze-axi.patch (renamed from target/linux/patches/3.18.4/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.18.5/microblaze-ethernet.patch (renamed from target/linux/patches/3.18.4/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.18.5/mkpiggy.patch (renamed from target/linux/patches/3.18.4/mkpiggy.patch)0
-rw-r--r--target/linux/patches/3.18.5/mtd-rootfs.patch (renamed from target/linux/patches/3.18.4/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.18.5/nfsv3-tcp.patch (renamed from target/linux/patches/3.18.4/nfsv3-tcp.patch)0
-rw-r--r--target/linux/patches/3.18.5/non-static.patch (renamed from target/linux/patches/3.18.4/non-static.patch)0
-rw-r--r--target/linux/patches/3.18.5/patch-fblogo (renamed from target/linux/patches/3.18.4/patch-fblogo)0
-rw-r--r--target/linux/patches/3.18.5/patch-yaffs2 (renamed from target/linux/patches/3.18.4/patch-yaffs2)0
-rw-r--r--target/linux/patches/3.18.5/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.18.4/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.18.5/relocs.patch (renamed from target/linux/patches/3.18.4/relocs.patch)0
-rw-r--r--target/linux/patches/3.18.5/sgidefs.patch (renamed from target/linux/patches/3.18.4/sgidefs.patch)0
-rw-r--r--target/linux/patches/3.18.5/sortext.patch (renamed from target/linux/patches/3.18.4/sortext.patch)0
-rw-r--r--target/linux/patches/3.18.5/startup.patch (renamed from target/linux/patches/3.18.4/startup.patch)0
-rw-r--r--target/linux/patches/3.18.5/wlan-cf.patch (renamed from target/linux/patches/3.18.4/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.18.5/xargs.patch (renamed from target/linux/patches/3.18.4/xargs.patch)0
-rw-r--r--target/m68k/qemu-m68k/patches/3.18.5/m68k-coldfire-fec.patch (renamed from target/m68k/qemu-m68k/patches/3.18.4/m68k-coldfire-fec.patch)0
-rw-r--r--target/m68k/qemu-m68k/patches/3.18.5/qemu-coldfire.patch (renamed from target/m68k/qemu-m68k/patches/3.18.4/qemu-coldfire.patch)0
-rw-r--r--target/mips64/lemote-yeelong/patches/3.18.5/sm7xx-fb.patch (renamed from target/mips64/lemote-yeelong/patches/3.18.4/sm7xx-fb.patch)0
32 files changed, 7213 insertions, 1390 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 4c7689b87..da78bbff6 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,8 +1,8 @@
-ifeq ($(ADK_KERNEL_VERSION_3_18_4),y)
-KERNEL_VERSION:= 3.18.4
+ifeq ($(ADK_KERNEL_VERSION_3_18_5),y)
+KERNEL_VERSION:= 3.18.5
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_HASH:= f2e285af516f33f0fe48a6812585c89ae502d672a19518f85d6e5cceaeedfd2d
+KERNEL_HASH:= e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90
endif
ifeq ($(ADK_KERNEL_VERSION_3_14_28),y)
KERNEL_VERSION:= 3.14.28
diff --git a/target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch
index 4543ea066..ecfb3256b 100644
--- a/target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi
+--- linux-3.18.5/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-02-02 09:28:02.514056428 +0100
@@ -0,0 +1,110 @@
+/include/ "skeleton.dtsi"
+
@@ -19,7 +19,7 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
-+ ranges = <0x7e000000 0x20000000 0x02000000>;
++ ranges = <0x7e000000 0x20000000 0x01000000>;
+
+ intc: interrupt-controller {
+ compatible = "brcm,bcm2708-armctrl-ic";
@@ -112,9 +112,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts
+--- linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-02-02 09:28:02.514056428 +0100
@@ -0,0 +1,101 @@
+/dts-v1/;
+
@@ -217,9 +217,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi-3.18.x/arch
+ act_led_trigger = <&act_led>,"linux,default-trigger";
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+--- linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-02-02 09:28:02.514056428 +0100
@@ -0,0 +1,101 @@
+/dts-v1/;
+
@@ -322,9 +322,78 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi-3.18.x
+ act_led_trigger = <&act_led>,"linux,default-trigger";
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-02-02 09:28:02.514056428 +0100
+@@ -0,0 +1,22 @@
++// Definitions for DS1307 Real Time Clock
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target = <&i2c1>;
++ __overlay__ {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ status = "okay";
++
++ ds1307@68 {
++ compatible = "maxim,ds1307";
++ reg = <0x68>;
++ status = "okay";
++ };
++ };
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-02-02 09:28:02.518056428 +0100
+@@ -0,0 +1,39 @@
++// Definitions for HiFiBerry Amp/Amp+
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target = <&sound>;
++ __overlay__ {
++ compatible = "hifiberry,hifiberry-amp";
++ i2s-controller = <&i2s>;
++ status = "okay";
++ };
++ };
++
++ fragment@1 {
++ target = <&i2s>;
++ __overlay__ {
++ status = "okay";
++ };
++ };
++
++ fragment@2 {
++ target = <&i2c1>;
++ __overlay__ {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ status = "okay";
++
++ tas5713@1b {
++ #sound-dai-cells = <0>;
++ compatible = "ti,tas5713";
++ reg = <0x1b>;
++ status = "okay";
++ };
++ };
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-02-02 09:28:02.518056428 +0100
@@ -0,0 +1,34 @@
+// Definitions for HiFiBerry DAC
+/dts-v1/;
@@ -360,9 +429,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi-3.1
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-02-02 09:28:02.518056428 +0100
@@ -0,0 +1,39 @@
+// Definitions for HiFiBerry DAC+
+/dts-v1/;
@@ -403,9 +472,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-02-02 09:28:02.518056428 +0100
@@ -0,0 +1,39 @@
+// Definitions for HiFiBerry Digi
+/dts-v1/;
@@ -446,9 +515,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi-3.
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-02-02 09:28:02.526056428 +0100
@@ -0,0 +1,39 @@
+// Definitions for IQaudIO DAC
+/dts-v1/;
@@ -489,9 +558,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi-3.18.
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-02-02 09:28:02.526056428 +0100
@@ -0,0 +1,39 @@
+// Definitions for IQaudIO DAC+
+/dts-v1/;
@@ -532,9 +601,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi-3
+ };
+ };
+};
-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
+diff -Nur linux-3.18.5/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-02-02 09:28:02.526056428 +0100
@@ -0,0 +1,57 @@
+// Definitions for lirc-rpi module
+/dts-v1/;
@@ -593,30 +662,195 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi-3.18.x/a
+ debug = <&lirc_rpi>,"rpi,debug:0";
+ };
+};
-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 @@
+diff -Nur linux-3.18.5/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile
+--- linux-3.18.5/arch/arm/boot/dts/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/Makefile 2015-02-02 09:28:02.506056428 +0100
+@@ -53,6 +53,20 @@
dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
+dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb
+dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb
++dtb-$(CONFIG_BCM2708_DT) += hifiberry-dac-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += hifiberry-dacplus-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += ds1307-rtc-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += w1-gpio-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += w1-gpio-pullup-overlay.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
-@@ -519,6 +521,7 @@
+@@ -519,6 +533,12 @@
targets += dtbs dtbs_install
targets += $(dtb-y)
+
++endif
++
++# Enable fixups to support overlays on BCM2708 platforms
++ifeq ($(CONFIG_BCM2708_DT),y)
++ DTC_FLAGS ?= -@
endif
# *.dtb used to be generated in the directory above. Clean out the
-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 @@
+diff -Nur linux-3.18.5/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 2015-02-02 09:28:02.534056428 +0100
+@@ -0,0 +1,22 @@
++// Definitions for PCF8523 Real Time Clock
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target = <&i2c1>;
++ __overlay__ {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ status = "okay";
++
++ pcf8523@68 {
++ compatible = "nxp,pcf8523";
++ reg = <0x68>;
++ status = "okay";
++ };
++ };
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/boot/dts/pps-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/pps-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts 2015-02-02 09:28:02.534056428 +0100
+@@ -0,0 +1,34 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++ fragment@0 {
++ target-path = "/";
++ __overlay__ {
++ pps: pps {
++ compatible = "pps-gpio";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pps_pins>;
++ gpios = <&gpio 18 0>;
++ status = "okay";
++ };
++ };
++ };
++
++ fragment@1 {
++ target = <&gpio>;
++ __overlay__ {
++ pps_pins: pps_pins {
++ brcm,pins = <18>;
++ brcm,function = <0>; // in
++ brcm,pull = <0>; // off
++ };
++ };
++ };
++
++ __overrides__ {
++ gpiopin = <&pps>,"gpios:4",
++ <&pps_pins>,"brcm,pins:0";
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/boot/dts/w1-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/w1-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts 2015-02-02 09:28:02.542056428 +0100
+@@ -0,0 +1,37 @@
++// Definitions for lirc-rpi module
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target-path = "/";
++ __overlay__ {
++
++ w1: onewire@0 {
++ compatible = "w1-gpio";
++ pinctrl-names = "default";
++ pinctrl-0 = <&w1_pins>;
++ gpios = <&gpio 4 0>;
++ status = "okay";
++ };
++ };
++ };
++
++ fragment@1 {
++ target = <&gpio>;
++ __overlay__ {
++ w1_pins: w1_pins {
++ brcm,pins = <4>;
++ brcm,function = <0>; // in (initially)
++ brcm,pull = <0>; // off
++ };
++ };
++ };
++
++ __overrides__ {
++ gpiopin = <&w1>,"gpios:4",
++ <&w1_pins>,"brcm,pins:0";
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts
+--- linux-3.18.5/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 2015-02-02 09:28:02.542056428 +0100
+@@ -0,0 +1,39 @@
++// Definitions for lirc-rpi module
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target-path = "/";
++ __overlay__ {
++
++ w1: onewire@0 {
++ compatible = "w1-gpio";
++ pinctrl-names = "default";
++ pinctrl-0 = <&w1_pins>;
++ gpios = <&gpio 4 0>, <&gpio 5 1>;
++ status = "okay";
++ };
++ };
++ };
++
++ fragment@1 {
++ target = <&gpio>;
++ __overlay__ {
++ w1_pins: w1_pins {
++ brcm,pins = <4 5>;
++ brcm,function = <0 1>; // in out
++ brcm,pull = <0 0>; // off off
++ };
++ };
++ };
++
++ __overrides__ {
++ gpiopin = <&w1>,"gpios:4",
++ <&w1_pins>,"brcm,pins:0";
++ pullup = <&w1>,"gpios:16",
++ <&w1_pins>,"brcm,pins:4";
++ };
++};
+diff -Nur linux-3.18.5/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.18.5/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2015-02-02 09:28:02.546056428 +0100
+@@ -0,0 +1,1144 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_PHYS_OFFSET=0
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -827,13 +1061,16 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_NAT=m
++CONFIG_IP_NF_TARGET_MASQUERADE=m
++CONFIG_IP_NF_TARGET_NETMAP=m
++CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
@@ -842,7 +1079,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_CONNTRACK_IPV6=m
-+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
@@ -857,6 +1093,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
++CONFIG_IP6_NF_NAT=m
++CONFIG_IP6_NF_TARGET_MASQUERADE=m
++CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1098,6 +1337,8 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_B43=m
+# CONFIG_B43_PHY_N is not set
+CONFIG_B43LEGACY=m
++CONFIG_BRCMFMAC=m
++CONFIG_BRCMFMAC_USB=y
+CONFIG_HOSTAP=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
@@ -1138,6 +1379,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
++CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_SERIO=m
@@ -1159,10 +1401,14 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_BCM_VC_SM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=m
++CONFIG_I2C_MUX=m
+CONFIG_I2C_BCM2708=m
+CONFIG_SPI=y
+CONFIG_SPI_BCM2708=m
+CONFIG_SPI_SPIDEV=y
++CONFIG_PPS=m
++CONFIG_PPS_CLIENT_LDISC=m
++CONFIG_PPS_CLIENT_GPIO=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_ARIZONA=m
+CONFIG_W1=m
@@ -1335,6 +1581,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
++CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_SHARK=m
@@ -1346,6 +1593,15 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
++# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
++CONFIG_VIDEO_UDA1342=m
++CONFIG_VIDEO_SONY_BTF_MPX=m
++CONFIG_VIDEO_TVP5150=m
++CONFIG_VIDEO_TW2804=m
++CONFIG_VIDEO_TW9903=m
++CONFIG_VIDEO_TW9906=m
++CONFIG_VIDEO_OV7640=m
++CONFIG_VIDEO_MT9V011=m
+CONFIG_FB=y
+CONFIG_FB_BCM2708=y
+# CONFIG_BACKLIGHT_GENERIC is not set
@@ -1394,6 +1650,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_HID_DRAGONRISE=m
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
++CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HID_KEYTOUCH=m
@@ -1653,6 +1910,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
++CONFIG_NFS_SWAP=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
@@ -1719,7 +1977,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_KGDB=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_KEYBOARD=y
-+CONFIG_STRICT_DEVMEM=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
@@ -1727,8 +1984,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
@@ -1740,9 +1995,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-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
+diff -Nur linux-3.18.5/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.18.5/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2015-02-02 09:28:02.546056428 +0100
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -1941,9 +2196,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.18.x/
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-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
+diff -Nur linux-3.18.5/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/include/asm/dma-mapping.h
+--- linux-3.18.5/arch/arm/include/asm/dma-mapping.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/include/asm/dma-mapping.h 2015-02-02 09:28:02.558056428 +0100
@@ -58,37 +58,21 @@
#ifndef __arch_pfn_to_dma
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
@@ -1983,9 +2238,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/dma-mapping.h linux-rpi-3.18.x/arch/
return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
}
-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
+diff -Nur linux-3.18.5/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h
+--- linux-3.18.5/arch/arm/include/asm/irqflags.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/include/asm/irqflags.h 2015-02-02 09:28:02.558056428 +0100
@@ -145,12 +145,22 @@
}
@@ -2012,9 +2267,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/irqflags.h linux-rpi-3.18.x/arch/arm
:
: "r" (flags)
: "memory", "cc");
-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
+diff -Nur linux-3.18.5/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h
+--- linux-3.18.5/arch/arm/include/asm/string.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/include/asm/string.h 2015-02-02 09:28:02.562056428 +0100
@@ -24,6 +24,11 @@
#define __HAVE_ARCH_MEMSET
extern void * memset(void *, int, __kernel_size_t);
@@ -2027,9 +2282,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/string.h linux-rpi-3.18.x/arch/arm/i
extern void __memzero(void *ptr, __kernel_size_t n);
#define memset(p,v,n) \
-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
+diff -Nur linux-3.18.5/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h
+--- linux-3.18.5/arch/arm/include/asm/uaccess.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/include/asm/uaccess.h 2015-02-02 09:28:02.562056428 +0100
@@ -475,6 +475,7 @@
#ifdef CONFIG_MMU
@@ -2038,9 +2293,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/uaccess.h linux-rpi-3.18.x/arch/arm/
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.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
+diff -Nur linux-3.18.5/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig
+--- linux-3.18.5/arch/arm/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/Kconfig 2015-02-02 09:28:02.506056428 +0100
@@ -381,6 +381,23 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -2073,9 +2328,9 @@ diff -Nur linux-3.18.3/arch/arm/Kconfig linux-rpi-3.18.x/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-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
+diff -Nur linux-3.18.5/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug
+--- linux-3.18.5/arch/arm/Kconfig.debug 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/Kconfig.debug 2015-02-02 09:28:02.506056428 +0100
@@ -985,6 +985,14 @@
options; the platform specific options are deprecated
and will be soon removed.
@@ -2091,9 +2346,9 @@ diff -Nur linux-3.18.3/arch/arm/Kconfig.debug linux-rpi-3.18.x/arch/arm/Kconfig.
endchoice
config DEBUG_EXYNOS_UART
-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
+diff -Nur linux-3.18.5/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S
+--- linux-3.18.5/arch/arm/kernel/fiqasm.S 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/kernel/fiqasm.S 2015-02-02 09:28:02.566056428 +0100
@@ -47,3 +47,7 @@
mov r0, r0 @ avoid hazard prior to ARMv4
ret lr
@@ -2102,9 +2357,9 @@ diff -Nur linux-3.18.3/arch/arm/kernel/fiqasm.S linux-rpi-3.18.x/arch/arm/kernel
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-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
+diff -Nur linux-3.18.5/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c
+--- linux-3.18.5/arch/arm/kernel/process.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/kernel/process.c 2015-02-02 09:28:02.570056428 +0100
@@ -166,6 +166,16 @@
}
#endif
@@ -2122,9 +2377,9 @@ diff -Nur linux-3.18.3/arch/arm/kernel/process.c linux-rpi-3.18.x/arch/arm/kerne
/*
* Called by kexec, immediately prior to machine_kexec().
*
-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
+diff -Nur linux-3.18.5/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h
+--- linux-3.18.5/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/arm-mem.h 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,159 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -2285,9 +2540,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/arm-mem.h linux-rpi-3.18.x/arch/arm/lib/arm-
+ .endif
+92:
+.endm
-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
+diff -Nur linux-3.18.5/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy_from_user.S
+--- linux-3.18.5/arch/arm/lib/copy_from_user.S 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/lib/copy_from_user.S 2015-02-02 09:28:02.574056428 +0100
@@ -84,11 +84,13 @@
.text
@@ -2303,9 +2558,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/copy_from_user.S linux-rpi-3.18.x/arch/arm/l
.pushsection .fixup,"ax"
.align 0
-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
+diff -Nur linux-3.18.5/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports_rpi.c
+--- linux-3.18.5/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/exports_rpi.c 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2014, Raspberry Pi (Trading) Ltd.
@@ -2344,9 +2599,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/exports_rpi.c linux-rpi-3.18.x/arch/arm/lib/
+#include <linux/module.h>
+
+EXPORT_SYMBOL(memcmp);
-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
+diff -Nur linux-3.18.5/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile
+--- linux-3.18.5/arch/arm/lib/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/lib/Makefile 2015-02-02 09:28:02.570056428 +0100
@@ -6,15 +6,24 @@
lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \
@@ -2375,9 +2630,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/Makefile linux-rpi-3.18.x/arch/arm/lib/Makef
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.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
+diff -Nur linux-3.18.5/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_rpi.S
+--- linux-3.18.5/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/memcmp_rpi.S 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,285 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -2664,9 +2919,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/memcmp_rpi.S linux-rpi-3.18.x/arch/arm/lib/m
+ .unreq DAT7
+ .unreq OFF
+ENDPROC(memcmp)
-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
+diff -Nur linux-3.18.5/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymove.h
+--- linux-3.18.5/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/memcpymove.h 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,506 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -3174,9 +3429,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/memcpymove.h linux-rpi-3.18.x/arch/arm/lib/m
+ .unreq LAST
+ .unreq OFF
+.endm
-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
+diff -Nur linux-3.18.5/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_rpi.S
+--- linux-3.18.5/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/memcpy_rpi.S 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -3237,9 +3492,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/memcpy_rpi.S linux-rpi-3.18.x/arch/arm/lib/m
+ENTRY(memcpy)
+ memcpy 0
+ENDPROC(memcpy)
-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
+diff -Nur linux-3.18.5/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove_rpi.S
+--- linux-3.18.5/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/memmove_rpi.S 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,61 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -3302,9 +3557,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/memmove_rpi.S linux-rpi-3.18.x/arch/arm/lib/
+ bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */
+ memcpy 1
+ENDPROC(memmove)
-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
+diff -Nur linux-3.18.5/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_rpi.S
+--- linux-3.18.5/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/lib/memset_rpi.S 2015-02-02 09:28:02.574056428 +0100
@@ -0,0 +1,121 @@
+/*
+Copyright (c) 2013, Raspberry Pi Foundation
@@ -3427,9 +3682,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/memset_rpi.S linux-rpi-3.18.x/arch/arm/lib/m
+ .unreq DAT2
+ .unreq DAT3
+ENDPROC(memset)
-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
+diff -Nur linux-3.18.5/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.18.5/arch/arm/lib/uaccess_with_memcpy.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/lib/uaccess_with_memcpy.c 2015-02-02 09:28:02.574056428 +0100
@@ -22,6 +22,14 @@
#include <asm/current.h>
#include <asm/page.h>
@@ -3573,9 +3828,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/uaccess_with_memcpy.c linux-rpi-3.18.x/arch/
static unsigned long noinline
__clear_user_memset(void __user *addr, unsigned long n)
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,315 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -3892,9 +4147,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.18.x/arch/arm
+ armctrl_dt_init();
+ return 0;
+}
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -3923,10 +4178,10 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.18.x/arch/arm
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-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 @@
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2015-02-02 09:28:02.582056429 +0100
+@@ -0,0 +1,1132 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
+ *
@@ -3966,6 +4221,7 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+#include <linux/spi/spi.h>
+#include <linux/gpio/machine.h>
+#include <linux/w1-gpio.h>
++#include <linux/pps-gpio.h>
+
+#include <linux/version.h>
+#include <linux/clkdev.h>
@@ -4022,6 +4278,8 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+static unsigned reboot_part = 0;
+static unsigned w1_gpio_pin = W1_GPIO;
+static unsigned w1_gpio_pullup = W1_PULLUP;
++static int pps_gpio_pin = -1;
++static bool vc_i2c_override = false;
+
+static unsigned use_dt = 0;
+
@@ -4202,6 +4460,19 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+};
+#endif
+
++static struct pps_gpio_platform_data pps_gpio_info = {
++ .assert_falling_edge = false,
++ .capture_clear = false,
++ .gpio_pin = -1,
++ .gpio_label = "PPS",
++};
++
++static struct platform_device pps_gpio_device = {
++ .name = "pps-gpio",
++ .id = PLATFORM_DEVID_NONE,
++ .dev.platform_data = &pps_gpio_info,
++};
++
+static u64 fb_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);
+
+static struct platform_device bcm2708_fb_device = {
@@ -4769,6 +5040,16 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+#ifdef CONFIG_BCM2708_GPIO
+ bcm_register_device_dt(&bcm2708_gpio_device);
+#endif
++
++#if defined(CONFIG_PPS_CLIENT_GPIO) || defined(CONFIG_PPS_CLIENT_GPIO_MODULE)
++ if (!use_dt && (pps_gpio_pin >= 0)) {
++ pr_info("bcm2708: GPIO %d setup as pps-gpio device\n", pps_gpio_pin);
++ pps_gpio_info.gpio_pin = pps_gpio_pin;
++ pps_gpio_device.id = pps_gpio_pin;
++ bcm_register_device(&pps_gpio_device);
++ }
++#endif
++
+#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
+ w1_gpio_pdata.pin = w1_gpio_pin;
+ w1_gpio_pdata.ext_pullup_enable_pin = w1_gpio_pullup;
@@ -4791,8 +5072,15 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+ bcm_register_device(&bcm2835_thermal_device);
+
+ bcm_register_device_dt(&bcm2708_spi_device);
-+ bcm_register_device_dt(&bcm2708_bsc0_device);
-+ bcm_register_device_dt(&bcm2708_bsc1_device);
++
++ if (vc_i2c_override) {
++ bcm_register_device_dt(&bcm2708_bsc0_device);
++ bcm_register_device_dt(&bcm2708_bsc1_device);
++ } else if ((boardrev & 0xffffff) == 0x2 || (boardrev & 0xffffff) == 0x3) {
++ bcm_register_device_dt(&bcm2708_bsc0_device);
++ } else {
++ bcm_register_device_dt(&bcm2708_bsc1_device);
++ }
+
+#if defined(CONFIG_SND_BCM2708_SOC_I2S) || defined(CONFIG_SND_BCM2708_SOC_I2S_MODULE)
+ bcm_register_device_dt(&bcm2708_i2s_device);
@@ -5022,9 +5310,13 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.18.x/arch/arm
+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.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
++module_param(pps_gpio_pin, int, 0644);
++MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS");
++module_param(vc_i2c_override, bool, 0644);
++MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral.");
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,426 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -5452,9 +5744,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.18.x/arc
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,49 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -5505,9 +5797,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.18.x/arch/arm
+}
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,409 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
@@ -5918,9 +6210,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/dma.c linux-rpi-3.18.x/arch/arm/mac
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -6341,9 +6633,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,62 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -6407,9 +6699,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-
+};
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -6418,9 +6710,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.1
+#define __clk_put(clk) do { } while (0)
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -6444,9 +6736,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp
+ .endm
+
+#include <debug/pl01x.S>
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,94 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -6542,9 +6834,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.18.x
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -6615,9 +6907,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6657,9 +6949,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.18.x
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,17 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6678,9 +6970,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.18.
+#define irq_to_gpio(x) ((x) - GPIO_IRQ_START)
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6710,9 +7002,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3
+#include <mach/platform.h>
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -6741,9 +7033,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.18.x/
+#define __io(a) __typesafe_io(a)
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6944,9 +7236,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.18.
+#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS)
+
+#endif /* _BCM2708_IRQS_H_ */
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -7005,9 +7297,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.1
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET))
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,228 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -7237,9 +7529,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3
+#endif
+
+/* END */
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -7267,9 +7559,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.18
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -7309,9 +7601,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.1
+}
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -7336,9 +7628,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.18
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,84 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -7424,9 +7716,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi
+ * nothing to do
+ */
+#define arch_decomp_wdog()
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,165 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -7593,9 +7885,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.18.
+#define DEVICE_FILE_NAME "vcio"
+
+#endif
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,35 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -7632,9 +7924,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.1
+#endif
+
+#endif /* VC_MEM_H */
-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
+diff -Nur linux-3.18.5/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.5/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,181 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -7817,9 +8109,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,55 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -7876,9 +8168,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,82 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -7962,9 +8254,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.18.5/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,20 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -7986,9 +8278,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END (0xe8000000)
-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
+diff -Nur linux-3.18.5/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.5/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,233 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -8223,9 +8515,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-
+/* ---- Function Prototypes ---------------------------------------------- */
+
+#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.18.5/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2015-02-02 09:28:02.578056429 +0100
@@ -0,0 +1,52 @@
+menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708
@@ -8279,9 +8571,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.18.x/arch/arm/m
+ help
+ Binds spidev driver to the SPI0 master
+endmenu
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile
+--- linux-3.18.5/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2015-02-02 09:28:02.578056429 +0100
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux kernel.
@@ -8290,16 +8582,16 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/Makefile linux-rpi-3.18.x/arch/arm/
+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.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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.18.5/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2015-02-02 09:28:02.578056429 +0100
@@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000
+params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/power.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,197 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.c
@@ -8498,9 +8790,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/power.c linux-rpi-3.18.x/arch/arm/m
+MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL");
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-bcm2708/vcio.c
@@ -8976,9 +9268,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.18.x/arch/arm/ma
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox");
-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
+diff -Nur linux-3.18.5/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.18.5/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c 2015-02-02 09:28:02.582056429 +0100
@@ -0,0 +1,432 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -9412,9 +9704,9 @@ diff -Nur linux-3.18.3/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.18.x/arch/arm/
+module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644);
+
-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
+diff -Nur linux-3.18.5/arch/arm/Makefile linux-rpi/arch/arm/Makefile
+--- linux-3.18.5/arch/arm/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/Makefile 2015-02-02 09:28:02.506056428 +0100
@@ -146,6 +146,7 @@
machine-$(CONFIG_ARCH_AT91) += at91
machine-$(CONFIG_ARCH_AXXIA) += axxia
@@ -9423,9 +9715,9 @@ diff -Nur linux-3.18.3/arch/arm/Makefile linux-rpi-3.18.x/arch/arm/Makefile
machine-$(CONFIG_ARCH_BERLIN) += berlin
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
-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
+diff -Nur linux-3.18.5/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig
+--- linux-3.18.5/arch/arm/mm/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/mm/Kconfig 2015-02-02 09:28:02.670056429 +0100
@@ -358,7 +358,7 @@
# ARMv6
@@ -9435,9 +9727,9 @@ diff -Nur linux-3.18.3/arch/arm/mm/Kconfig linux-rpi-3.18.x/arch/arm/mm/Kconfig
select CPU_32v6
select CPU_ABRT_EV6
select CPU_CACHE_V6
-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
+diff -Nur linux-3.18.5/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S
+--- linux-3.18.5/arch/arm/mm/proc-v6.S 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/mm/proc-v6.S 2015-02-02 09:28:02.674056429 +0100
@@ -73,10 +73,19 @@
*
* IRQs are already disabled.
@@ -9461,9 +9753,9 @@ diff -Nur linux-3.18.3/arch/arm/mm/proc-v6.S linux-rpi-3.18.x/arch/arm/mm/proc-v
ret lr
ENTRY(cpu_v6_dcache_clean_area)
-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
+diff -Nur linux-3.18.5/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types
+--- linux-3.18.5/arch/arm/tools/mach-types 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/arch/arm/tools/mach-types 2015-02-02 09:28:02.682056429 +0100
@@ -522,6 +522,7 @@
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
paz00 MACH_PAZ00 PAZ00 3128
@@ -9472,9 +9764,9 @@ diff -Nur linux-3.18.3/arch/arm/tools/mach-types linux-rpi-3.18.x/arch/arm/tools
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.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
+diff -Nur linux-3.18.5/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt
+--- linux-3.18.5/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2015-02-02 09:28:02.474056428 +0100
@@ -0,0 +1,60 @@
+
+BCM2835 (aka Raspberry Pi) V4L2 driver
@@ -9536,9 +9828,9 @@ diff -Nur linux-3.18.3/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi-3.18
+List of available formats:
+
+$ v4l2-ctl --list-formats
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig
+--- linux-3.18.5/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/Kconfig 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,22 @@
+#
+# Broadcom char driver config
@@ -9562,15 +9854,15 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/Kconfig linux-rpi-3.18.x/drivers/ch
+ help
+ Support for the VC shared memory on the Broadcom reference
+ design. Uses the VCHIQ stack.
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile
+--- linux-3.18.5/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/Makefile 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_BCM_VC_CMA) += vc_cma/
+obj-$(CONFIG_BCM_VC_SM) += vc_sm/
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile
+--- linux-3.18.5/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,14 @@
+ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs
+ccflags-y += -Werror
@@ -9586,9 +9878,9 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.18.x/dr
+obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o
+
+vc-cma-objs := vc_cma.o
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c
+--- linux-3.18.5/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,1143 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -10733,9 +11025,9 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.18.x/dr
+module_exit(vc_cma_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/char/broadcom/vc_sm/Makefile
+--- linux-3.18.5/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_sm/Makefile 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,21 @@
+EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2
+
@@ -10758,9 +11050,9 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/Makefile linux-rpi-3.18.x/dri
+vc-sm-objs := \
+ vmcs_sm.o \
+ vc_vchi_sm.o
-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
+diff -Nur linux-3.18.5/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c
+--- linux-3.18.5/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,492 @@
+/*****************************************************************************
+* Copyright 2011-2012 Broadcom Corporation. All rights reserved.
@@ -11254,9 +11546,9 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi-3.18.x
+ 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.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
+diff -Nur linux-3.18.5/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c
+--- linux-3.18.5/drivers/char/broadcom/vc_sm/vmcs_sm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c 2015-02-02 09:28:03.298056433 +0100
@@ -0,0 +1,3163 @@
+/*****************************************************************************
+* Copyright 2011-2012 Broadcom Corporation. All rights reserved.
@@ -14421,9 +14713,9 @@ diff -Nur linux-3.18.3/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi-3.18.x/dr
+MODULE_AUTHOR("Broadcom");
+MODULE_DESCRIPTION("VideoCore SharedMemory Driver");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c
+--- linux-3.18.5/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2015-02-02 09:28:03.302056433 +0100
@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -14543,9 +14835,9 @@ diff -Nur linux-3.18.3/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.18.x/dri
+
+MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver");
+MODULE_LICENSE("GPL and additional rights");
-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
+diff -Nur linux-3.18.5/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig
+--- linux-3.18.5/drivers/char/hw_random/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/char/hw_random/Kconfig 2015-02-02 09:28:03.302056433 +0100
@@ -320,6 +320,17 @@
If unsure, say Y.
@@ -14564,9 +14856,9 @@ diff -Nur linux-3.18.3/drivers/char/hw_random/Kconfig linux-rpi-3.18.x/drivers/c
config HW_RANDOM_MSM
tristate "Qualcomm SoCs Random Number Generator support"
depends on HW_RANDOM && ARCH_QCOM
-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
+diff -Nur linux-3.18.5/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile
+--- linux-3.18.5/drivers/char/hw_random/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/char/hw_random/Makefile 2015-02-02 09:28:03.302056433 +0100
@@ -28,5 +28,6 @@
obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o
obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
@@ -14574,9 +14866,9 @@ diff -Nur linux-3.18.3/drivers/char/hw_random/Makefile linux-rpi-3.18.x/drivers/
+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.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
+diff -Nur linux-3.18.5/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig
+--- linux-3.18.5/drivers/char/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/char/Kconfig 2015-02-02 09:28:03.298056433 +0100
@@ -581,6 +581,8 @@
source "drivers/s390/char/Kconfig"
@@ -14586,17 +14878,17 @@ diff -Nur linux-3.18.3/drivers/char/Kconfig linux-rpi-3.18.x/drivers/char/Kconfi
config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports"
default n
-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
+diff -Nur linux-3.18.5/drivers/char/Makefile linux-rpi/drivers/char/Makefile
+--- linux-3.18.5/drivers/char/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/char/Makefile 2015-02-02 09:28:03.298056433 +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.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
+diff -Nur linux-3.18.5/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c
+--- linux-3.18.5/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2015-02-02 09:28:03.330056433 +0100
@@ -0,0 +1,224 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -14822,9 +15114,9 @@ diff -Nur linux-3.18.3/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.18.x/driver
+
+module_init(bcm2835_cpufreq_module_init);
+module_exit(bcm2835_cpufreq_module_exit);
-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
+diff -Nur linux-3.18.5/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm
+--- linux-3.18.5/drivers/cpufreq/Kconfig.arm 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/cpufreq/Kconfig.arm 2015-02-02 09:28:03.330056433 +0100
@@ -241,6 +241,14 @@
help
This adds the CPUFreq driver support for SPEAr SOCs.
@@ -14840,9 +15132,9 @@ diff -Nur linux-3.18.3/drivers/cpufreq/Kconfig.arm linux-rpi-3.18.x/drivers/cpuf
config ARM_TEGRA_CPUFREQ
bool "TEGRA CPUFreq support"
depends on ARCH_TEGRA
-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
+diff -Nur linux-3.18.5/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile
+--- linux-3.18.5/drivers/cpufreq/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/cpufreq/Makefile 2015-02-02 09:28:03.330056433 +0100
@@ -75,6 +75,7 @@
obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o
obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
@@ -14851,9 +15143,9 @@ diff -Nur linux-3.18.3/drivers/cpufreq/Makefile linux-rpi-3.18.x/drivers/cpufreq
obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o
obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o
-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
+diff -Nur linux-3.18.5/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c
+--- linux-3.18.5/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2015-02-02 09:28:03.350056433 +0100
@@ -0,0 +1,1052 @@
+/*
+ * BCM2835 DMA engine support
@@ -15907,9 +16199,9 @@ diff -Nur linux-3.18.3/drivers/dma/bcm2708-dmaengine.c linux-rpi-3.18.x/drivers/
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_AUTHOR("Gellert Weisz <gellert@raspberrypi.org>");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig
+--- linux-3.18.5/drivers/dma/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/dma/Kconfig 2015-02-02 09:28:03.350056433 +0100
@@ -330,6 +330,12 @@
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
@@ -15923,9 +16215,9 @@ diff -Nur linux-3.18.3/drivers/dma/Kconfig linux-rpi-3.18.x/drivers/dma/Kconfig
config TI_CPPI41
tristate "AM33xx CPPI41 DMA support"
depends on ARCH_OMAP
-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
+diff -Nur linux-3.18.5/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile
+--- linux-3.18.5/drivers/dma/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/dma/Makefile 2015-02-02 09:28:03.350056433 +0100
@@ -38,6 +38,7 @@
obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o
obj-$(CONFIG_DMA_OMAP) += omap-dma.o
@@ -15934,9 +16226,9 @@ diff -Nur linux-3.18.3/drivers/dma/Makefile linux-rpi-3.18.x/drivers/dma/Makefil
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.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
+diff -Nur linux-3.18.5/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhid/hid-core.c
+--- linux-3.18.5/drivers/hid/usbhid/hid-core.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/hid/usbhid/hid-core.c 2015-02-02 09:28:03.526056434 +0100
@@ -49,7 +49,7 @@
* Module parameters.
*/
@@ -15961,9 +16253,9 @@ diff -Nur linux-3.18.3/drivers/hid/usbhid/hid-core.c linux-rpi-3.18.x/drivers/hi
ret = -ENOMEM;
if (usb_endpoint_dir_in(endpoint)) {
-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
+diff -Nur linux-3.18.5/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c
+--- linux-3.18.5/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2015-02-02 09:28:03.534056434 +0100
@@ -0,0 +1,219 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -16184,9 +16476,9 @@ diff -Nur linux-3.18.3/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.18.x/drivers/hw
+MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_hwmon_driver);
-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
+diff -Nur linux-3.18.5/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig
+--- linux-3.18.5/drivers/hwmon/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/hwmon/Kconfig 2015-02-02 09:28:03.530056434 +0100
@@ -1680,6 +1680,16 @@
This driver provides support for the Ultra45 workstation environmental
sensors.
@@ -16204,9 +16496,9 @@ diff -Nur linux-3.18.3/drivers/hwmon/Kconfig linux-rpi-3.18.x/drivers/hwmon/Kcon
if ACPI
comment "ACPI drivers"
-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
+diff -Nur linux-3.18.5/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile
+--- linux-3.18.5/drivers/hwmon/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/hwmon/Makefile 2015-02-02 09:28:03.530056434 +0100
@@ -153,6 +153,7 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -16215,9 +16507,9 @@ diff -Nur linux-3.18.3/drivers/hwmon/Makefile linux-rpi-3.18.x/drivers/hwmon/Mak
obj-$(CONFIG_PMBUS) += pmbus/
-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
+diff -Nur linux-3.18.5/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c
+--- linux-3.18.5/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2015-02-02 09:28:03.550056434 +0100
@@ -0,0 +1,473 @@
+/*
+ * Driver for Broadcom BCM2708 BSC Controllers
@@ -16692,9 +16984,9 @@ diff -Nur linux-3.18.3/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.18.x/drivers
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-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
+diff -Nur linux-3.18.5/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig
+--- linux-3.18.5/drivers/i2c/busses/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/i2c/busses/Kconfig 2015-02-02 09:28:03.546056434 +0100
@@ -361,7 +361,7 @@
config I2C_BCM2835
@@ -16730,9 +17022,9 @@ diff -Nur linux-3.18.3/drivers/i2c/busses/Kconfig linux-rpi-3.18.x/drivers/i2c/b
config I2C_BCM_KONA
tristate "BCM Kona I2C adapter"
depends on ARCH_BCM_MOBILE
-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
+diff -Nur linux-3.18.5/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile
+--- linux-3.18.5/drivers/i2c/busses/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/i2c/busses/Makefile 2015-02-02 09:28:03.546056434 +0100
@@ -33,6 +33,7 @@
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o
@@ -16741,9 +17033,9 @@ diff -Nur linux-3.18.3/drivers/i2c/busses/Makefile linux-rpi-3.18.x/drivers/i2c/
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.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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c
+--- linux-3.18.5/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,1824 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18569,9 +18861,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi
+
+module_init(bm2835_mmal_init);
+module_exit(bm2835_mmal_exit);
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,126 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18699,9 +18991,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c
+--- linux-3.18.5/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,1322 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20025,9 +20317,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/controls.c linux-rpi-3.18.
+
+ return 0;
+}
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig
+--- linux-3.18.5/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,25 @@
+# Broadcom VideoCore IV v4l2 camera support
+
@@ -20054,18 +20346,18 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/Kconfig linux-rpi-3.18.x/d
+
+
+endif # VIDEO_BM2835
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile
+--- linux-3.18.5/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2015-02-02 09:28:03.782056435 +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.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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,53 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20120,9 +20412,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-common.h linux-rpi-3.
+ u32 v;
+};
+
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,127 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20251,9 +20543,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi
+/* @} MmalColorSpace List */
+
+#endif /* MMAL_ENCODINGS_H */
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,50 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20305,9 +20597,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rp
+};
+
+#endif /* MMAL_MSG_COMMON_H */
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,81 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20390,9 +20682,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rp
+};
+
+#endif /* MMAL_MSG_FORMAT_H */
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,404 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20798,9 +21090,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi-3.18.
+ u8 payload[MMAL_MSG_MAX_PAYLOAD];
+ } u;
+};
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,107 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -20909,9 +21201,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi-
+ */
+
+};
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,656 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -21569,9 +21861,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,1916 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -23489,9 +23781,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi-3.1
+ kfree(instance);
+ return -ENODEV;
+}
-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
+diff -Nur linux-3.18.5/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h
+--- linux-3.18.5/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-02-02 09:28:03.782056435 +0100
@@ -0,0 +1,178 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -23671,9 +23963,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi-3.1
+ struct mmal_buffer *buf);
+
+#endif /* MMAL_VCHIQ_H */
-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
+diff -Nur linux-3.18.5/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig
+--- linux-3.18.5/drivers/media/platform/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/media/platform/Kconfig 2015-02-02 09:28:03.782056435 +0100
@@ -126,6 +126,7 @@
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
@@ -23682,9 +23974,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/Kconfig linux-rpi-3.18.x/drivers/m
endif # V4L_PLATFORM_DRIVERS
-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
+diff -Nur linux-3.18.5/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile
+--- linux-3.18.5/drivers/media/platform/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/media/platform/Makefile 2015-02-02 09:28:03.782056435 +0100
@@ -49,4 +49,6 @@
obj-y += omap/
@@ -23692,9 +23984,9 @@ diff -Nur linux-3.18.3/drivers/media/platform/Makefile linux-rpi-3.18.x/drivers/
+obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-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
+diff -Nur linux-3.18.5/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+--- linux-3.18.5/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-02-02 09:28:03.834056436 +0100
@@ -1531,6 +1531,10 @@
&rtl2832u_props, "Compro VideoMate U620F", NULL) },
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
@@ -23706,9 +23998,9 @@ diff -Nur linux-3.18.3/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi-3.18.x/
{ 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.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
+diff -Nur linux-3.18.5/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig
+--- linux-3.18.5/drivers/misc/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/misc/Kconfig 2015-02-02 09:28:03.890056436 +0100
@@ -524,6 +524,7 @@
source "drivers/misc/altera-stapl/Kconfig"
source "drivers/misc/mei/Kconfig"
@@ -23717,9 +24009,9 @@ diff -Nur linux-3.18.3/drivers/misc/Kconfig linux-rpi-3.18.x/drivers/misc/Kconfi
source "drivers/misc/mic/Kconfig"
source "drivers/misc/genwqe/Kconfig"
source "drivers/misc/echo/Kconfig"
-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
+diff -Nur linux-3.18.5/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile
+--- linux-3.18.5/drivers/misc/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/misc/Makefile 2015-02-02 09:28:03.890056436 +0100
@@ -51,6 +51,7 @@
obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/
obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o
@@ -23728,9 +24020,9 @@ diff -Nur linux-3.18.3/drivers/misc/Makefile linux-rpi-3.18.x/drivers/misc/Makef
obj-y += mic/
obj-$(CONFIG_GENWQE) += genwqe/
obj-$(CONFIG_ECHO) += echo/
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,328 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24060,9 +24352,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/connections/con
+#endif /* CONNECTION_H_ */
+
+/****************************** End of file **********************************/
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24268,9 +24560,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/message_drivers
+#endif // _VCHI_MESSAGE_H_
+
+/****************************** End of file ***********************************/
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24496,9 +24788,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu
+#endif /* VCHI_CFG_H_ */
+
+/****************************** End of file **********************************/
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24571,9 +24863,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern
+//#define VCHI_RX_NANOLOCKS
+
+#endif /*VCHI_CFG_INTERNAL_H_*/
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24749,9 +25041,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_common.h l
+
+
+#endif // VCHI_COMMON_H_
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,378 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -25131,9 +25423,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp
+#endif /* VCHI_H_ */
+
+/****************************** End of file **********************************/
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -25177,9 +25469,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux
+#define VCHI_MEM_HANDLE_INVALID 0
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,562 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -25743,9 +26035,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835
+
+ kfree(pagelist);
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -25789,9 +26081,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,2884 @@
+/**
+ * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved.
@@ -28677,9 +28969,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,223 @@
+/**
+ * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved.
@@ -28904,9 +29196,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
+
+
+#endif /* VCHIQ_ARM_H */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28945,9 +29237,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2010-2014 Broadcom. All rights reserved.
@@ -29015,9 +29307,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.
+#endif
+
+#endif /* VCHIQ_CFG_H */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29139,9 +29431,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29193,9 +29485,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn
+void vchiq_call_connected_callbacks(void);
+
+#endif /* VCHIQ_CONNECTED_H */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,3862 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -33059,9 +33351,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
+ numBytes = 0;
+ }
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,711 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -33774,9 +34066,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
+ size_t numBytes);
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,383 @@
+/**
+ * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved.
@@ -34161,9 +34453,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu
+}
+
+#endif /* CONFIG_DEBUG_FS */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved.
@@ -34217,9 +34509,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,87 @@
+#!/usr/bin/perl -w
+
@@ -34308,9 +34600,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv
+ return vchiq_build_time;
+}
+EOF
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+--- linux-3.18.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -34352,9 +34644,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li
+#include "vchiq_util.h"
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,189 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -34545,9 +34837,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+ short *peer_version);
+
+#endif /* VCHIQ_IF_H */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -34680,9 +34972,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct
+#define VCHIQ_IOC_MAX 17
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,458 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -35142,9 +35434,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern
+
+ return status;
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -35215,9 +35507,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kill
+#define mutex_lock_interruptible mutex_lock_interruptible_killable
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -35290,9 +35582,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd
+ const VCHIQ_PLATFORM_DATA_T * platform_data);
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -35352,9 +35644,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page
+} FRAGMENTS_T;
+
+#endif /* VCHIQ_PAGELIST_H */
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2015-02-02 09:28:03.910056436 +0100
@@ -0,0 +1,857 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -36213,9 +36505,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim
+ return ret;
+}
+EXPORT_SYMBOL(vchi_service_release);
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2015-02-02 09:28:03.910056436 +0100
@@ -0,0 +1,152 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -36369,9 +36661,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util
+
+ return header;
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2015-02-02 09:28:03.910056436 +0100
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -36454,9 +36746,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2015-02-02 09:28:03.910056436 +0100
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -36517,9 +36809,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers
+{
+ return vchiq_build_time;
+}
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig
+--- linux-3.18.5/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/Kconfig 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,9 @@
+config BCM2708_VCHIQ
+ tristate "Videocore VCHIQ"
@@ -36530,9 +36822,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/Kconfig linux-rpi-3.18.x/drive
+ BCM2708 family of products.
+ Defaults to Y when the Broadcom Videocore services
+ are included in the build, N otherwise.
-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
+diff -Nur linux-3.18.5/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile
+--- linux-3.18.5/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/misc/vc04_services/Makefile 2015-02-02 09:28:03.906056436 +0100
@@ -0,0 +1,17 @@
+ifeq ($(CONFIG_MACH_BCM2708),y)
+
@@ -36551,9 +36843,9 @@ diff -Nur linux-3.18.3/drivers/misc/vc04_services/Makefile linux-rpi-3.18.x/driv
+ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
+
+endif
-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
+diff -Nur linux-3.18.5/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quirks.c
+--- linux-3.18.5/drivers/mmc/core/quirks.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/mmc/core/quirks.c 2015-02-02 09:28:03.910056436 +0100
@@ -95,5 +95,9 @@
f->vendor_fixup(card, f->data);
}
@@ -36564,9 +36856,9 @@ diff -Nur linux-3.18.3/drivers/mmc/core/quirks.c linux-rpi-3.18.x/drivers/mmc/co
+ 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
+diff -Nur linux-3.18.5/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host/bcm2835-mmc.c
+--- linux-3.18.5/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/mmc/host/bcm2835-mmc.c 2015-02-02 09:28:03.914056436 +0100
@@ -0,0 +1,1557 @@
+/*
+ * BCM2835 MMC host driver.
@@ -38125,9 +38417,9 @@ diff -Nur linux-3.18.3/drivers/mmc/host/bcm2835-mmc.c linux-rpi-3.18.x/drivers/m
+MODULE_DESCRIPTION("BCM2835 SDHCI driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gellert Weisz");
-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
+diff -Nur linux-3.18.5/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig
+--- linux-3.18.5/drivers/mmc/host/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/mmc/host/Kconfig 2015-02-02 09:28:03.914056436 +0100
@@ -281,17 +281,6 @@
If you have a controller with this interface, say Y or M here.
@@ -38182,9 +38474,9 @@ diff -Nur linux-3.18.3/drivers/mmc/host/Kconfig linux-rpi-3.18.x/drivers/mmc/hos
config MMC_OMAP
tristate "TI OMAP Multimedia Card Interface support"
depends on ARCH_OMAP
-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
+diff -Nur linux-3.18.5/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile
+--- linux-3.18.5/drivers/mmc/host/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/mmc/host/Makefile 2015-02-02 09:28:03.914056436 +0100
@@ -17,6 +17,7 @@
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o
@@ -38193,9 +38485,9 @@ diff -Nur linux-3.18.3/drivers/mmc/host/Makefile linux-rpi-3.18.x/drivers/mmc/ho
obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
obj-$(CONFIG_MMC_OMAP) += omap.o
-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
+diff -Nur linux-3.18.5/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c
+--- linux-3.18.5/drivers/net/usb/smsc95xx.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/net/usb/smsc95xx.c 2015-02-02 09:28:04.134056437 +0100
@@ -59,6 +59,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
@@ -38275,9 +38567,9 @@ diff -Nur linux-3.18.3/drivers/net/usb/smsc95xx.c linux-rpi-3.18.x/drivers/net/u
/* 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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/Kconfig linux-rpi/drivers/net/wireless/Kconfig
+--- linux-3.18.5/drivers/net/wireless/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/net/wireless/Kconfig 2015-02-02 09:28:04.142056437 +0100
@@ -277,7 +277,8 @@
source "drivers/net/wireless/orinoco/Kconfig"
source "drivers/net/wireless/p54/Kconfig"
@@ -38288,9 +38580,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/Kconfig linux-rpi-3.18.x/drivers/net
source "drivers/net/wireless/ti/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
source "drivers/net/wireless/mwifiex/Kconfig"
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/Makefile linux-rpi/drivers/net/wireless/Makefile
+--- linux-3.18.5/drivers/net/wireless/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/net/wireless/Makefile 2015-02-02 09:28:04.142056437 +0100
@@ -24,7 +24,8 @@
obj-$(CONFIG_ZD1211RW) += zd1211rw/
obj-$(CONFIG_RTL8180) += rtl818x/
@@ -38301,18 +38593,18 @@ diff -Nur linux-3.18.3/drivers/net/wireless/Makefile linux-rpi-3.18.x/drivers/ne
# 16-bit wireless PCMCIA client drivers
obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/clean linux-rpi/drivers/net/wireless/rtl8192cu/clean
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/clean 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/clean 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,5 @@
+#!/bin/bash
+rmmod 8192cu
+rmmod 8192ce
+rmmod 8192du
+rmmod 8192de
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,1147 @@
+/******************************************************************************
+ *
@@ -39461,9 +39753,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c lin
+#endif //PLATFORM_LINUX
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,2940 @@
+/******************************************************************************
+ *
@@ -42405,9 +42697,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi-3.
+#endif //CONFIG_NATIVEAP_MLME
+#endif //CONFIG_AP_MODE
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,1699 @@
+/******************************************************************************
+ *
@@ -44108,9 +44400,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rp
+}
+
+#endif // CONFIG_BR_EXT
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,3035 @@
+/******************************************************************************
+ *
@@ -47147,9 +47439,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi-3
+
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1337 @@
+/******************************************************************************
+ *
@@ -48488,9 +48780,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,423 @@
+/******************************************************************************
+ *
@@ -48915,9 +49207,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rp
+_func_exit_;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1915 @@
+/******************************************************************************
+ *
@@ -50834,9 +51126,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux
+ return _action_public_str[action];
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_io.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,464 @@
+/******************************************************************************
+ *
@@ -51302,9 +51594,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi-3.
+#endif
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,196 @@
+/******************************************************************************
+ *
@@ -51502,9 +51794,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c lin
+}
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1031 @@
+/******************************************************************************
+ *
@@ -52537,9 +52829,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux
+ return status;
+}
+//************** oid_rtl_seg_03_00 section end **************
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1494 @@
+/******************************************************************************
+ *
@@ -54035,9 +54327,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux
+ return _FAIL;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,263 @@
+/******************************************************************************
+ *
@@ -54302,9 +54594,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi-3
+
+#endif //CONFIG_IOL
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,3967 @@
+/******************************************************************************
+ *
@@ -58273,9 +58565,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi-
+}
+#endif //CONFIG_CONCURRENT_MODE
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,13600 @@
+/******************************************************************************
+ *
@@ -71877,9 +72169,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-
+
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1324 @@
+/******************************************************************************
+ *
@@ -73205,9 +73497,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi-3.
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,2954 @@
+/******************************************************************************
+ *
@@ -76163,9 +76455,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-
+#endif
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,5294 @@
+/******************************************************************************
+ *
@@ -81461,9 +81753,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi-3
+
+#endif //CONFIG_P2P
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,1540 @@
+/******************************************************************************
+ *
@@ -83005,9 +83297,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-r
+}
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,4289 @@
+/******************************************************************************
+ *
@@ -87298,9 +87590,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi-
+
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 2015-02-02 09:28:04.258056438 +0100
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
@@ -87397,9 +87689,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi-3.
+ return ch;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_security.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,3115 @@
+/******************************************************************************
+ *
@@ -90516,9 +90808,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-
+ return status;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,352 @@
+/******************************************************************************
+ *
@@ -90872,9 +91164,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rp
+#endif
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,848 @@
+/******************************************************************************
+ *
@@ -91724,9 +92016,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-r
+
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,2941 @@
+/******************************************************************************
+ *
@@ -94669,9 +94961,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi-
+
+#endif //CONFIG_TDLS
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,2305 @@
+/******************************************************************************
+ *
@@ -96978,9 +97270,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux
+ return status;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,4156 @@
+/******************************************************************************
+ *
@@ -101138,9 +101430,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi-
+}
+#endif //CONFIG_XMIT_ACK
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/dm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,314 @@
+/******************************************************************************
+ *
@@ -101456,9 +101748,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi-3.18.x/
+#endif /* CONFIG_DM_ADAPTIVITY */
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/dm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,30 @@
+/******************************************************************************
+ *
@@ -101490,9 +101782,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi-3.18.x/
+void dm_adaptivity(_adapter *pAdapter);
+
+#endif /* __DM_H__ */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/hal_com.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,371 @@
+/******************************************************************************
+ *
@@ -101865,9 +102157,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi-3.
+ return ret;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,546 @@
+/******************************************************************************
+ *
@@ -102415,9 +102707,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi-3
+ return adapter->HalFunc.c2h_id_filter_ccx;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,177 @@
+/******************************************************************************
+ *
@@ -102596,9 +102888,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-r
+}
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,1159 @@
+/******************************************************************************
+ *
@@ -103759,9 +104051,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.
+
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,5056 @@
+/******************************************************************************
+ *
@@ -108819,9 +109111,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c
+
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,3628 @@
+/******************************************************************************
+ *
@@ -112451,9 +112743,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_
+ pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8192c;
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,1207 @@
+/******************************************************************************
+ *
@@ -113662,9 +113954,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c
+}
+
+#endif // CONFIG_MP_INCLUDE
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,4841 @@
+/******************************************************************************
+ *
@@ -118507,9 +118799,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phyc
+ }
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,1031 @@
+/******************************************************************************
+ *
@@ -119542,9 +119834,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf60
+
+/* End of HalRf6052.c */
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,876 @@
+/******************************************************************************
+ *
@@ -120422,9 +120714,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxde
+}
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,94 @@
+/******************************************************************************
+ *
@@ -120520,9 +120812,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sres
+}
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 2015-02-02 09:28:04.262056438 +0100
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
@@ -120587,9 +120879,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit
+}
+#endif //CONFIG_XMIT_ACK
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,8758 @@
+/******************************************************************************
+ *
@@ -129349,9 +129641,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU
+0xc78,0x621f001e,
+};
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,2564 @@
+/******************************************************************************
+ *
@@ -131917,9 +132209,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU
+
+
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,2675 @@
+/******************************************************************************
+ *
@@ -134596,9 +134888,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu
+ DeInitLed871x( &(ledpriv->SwLed1) );
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,229 @@
+/******************************************************************************
+ *
@@ -134829,9 +135121,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu
+}
+
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1150 @@
+/******************************************************************************
+ *
@@ -135983,9 +136275,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu
+}
+#endif
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,6261 @@
+/******************************************************************************
+ *
@@ -142248,9 +142540,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halin
+
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1207 @@
+/******************************************************************************
+ *
@@ -143459,9 +143751,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_c
+}
+
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1536 @@
+/******************************************************************************
+ *
@@ -144999,9 +145291,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_l
+
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1265 @@
+/******************************************************************************
+ *
@@ -146268,18 +146560,18 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_x
+
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,4 @@
+#DHCP client
+DEVICE=wlan0
+BOOTPROTO=dhcp
+ONBOOT=yes
\ No newline at end of file
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/autoconf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,336 @@
+/******************************************************************************
+ *
@@ -146617,9 +146909,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/basic_types.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,321 @@
+/******************************************************************************
+ *
@@ -146942,9 +147234,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/basic_types.h linu
+
+#endif //__BASIC_TYPES_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
@@ -147033,9 +147325,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/big_endi
+#include <byteorder/generic.h>
+
+#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,212 @@
+/******************************************************************************
+ *
@@ -147249,9 +147541,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/generic.
+#endif
+
+#endif /* _LINUX_BYTEORDER_GENERIC_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
@@ -147342,9 +147634,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/little_e
+#include <byteorder/generic.h>
+
+#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,156 @@
+/******************************************************************************
+ *
@@ -147502,9 +147794,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h
+#endif
+
+#endif /* _LINUX_BYTEORDER_SWABB_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,140 @@
+/******************************************************************************
+ *
@@ -147646,9 +147938,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h l
+#endif
+
+#endif /* _LINUX_BYTEORDER_SWAB_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/circ_buf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,27 @@
+/******************************************************************************
+ *
@@ -147677,9 +147969,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,36 @@
+/******************************************************************************
+ *
@@ -147717,9 +148009,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
@@ -147799,9 +148091,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-r
+
+#endif // __DRV_CONF_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
@@ -147895,9 +148187,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h lin
+
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,662 @@
+/******************************************************************************
+ *
@@ -148561,9 +148853,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-
+
+#endif //__DRV_TYPES_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,25 @@
+/******************************************************************************
+ *
@@ -148590,9 +148882,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
@@ -148664,9 +148956,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h l
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
@@ -148763,9 +149055,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h lin
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ethernet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,41 @@
+/******************************************************************************
+ *
@@ -148808,9 +149100,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-r
+
+
+#endif // #ifndef __INC_ETHERNET_H
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/h2clbk.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,35 @@
+/******************************************************************************
+ *
@@ -148847,9 +149139,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,85 @@
+/******************************************************************************
+ *
@@ -148936,9 +149228,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,428 @@
+/******************************************************************************
+ *
@@ -149368,9 +149660,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h l
+
+#endif // __INC_HAL8192CPHYCFG_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1123 @@
+/******************************************************************************
+ *
@@ -150495,9 +150787,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h l
+
+#endif //__INC_HAL8192SPHYREG_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,105 @@
+/******************************************************************************
+ *
@@ -150604,9 +150896,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
@@ -150642,9 +150934,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wow
+
+#endif //__INC_HAL8192CU_FW_IMG_WOWLAN_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,66 @@
+/******************************************************************************
+ *
@@ -150712,9 +151004,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,528 @@
+/******************************************************************************
+ *
@@ -151244,9 +151536,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h l
+
+#endif // __INC_HAL8192SPHYCFG_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,1171 @@
+/******************************************************************************
+ *
@@ -152419,9 +152711,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h l
+
+#endif //__INC_HAL8192SPHYREG_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,66 @@
+/******************************************************************************
+ *
@@ -152489,9 +152781,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,30 @@
+/******************************************************************************
+ *
@@ -152523,9 +152815,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wow
+
+#endif //__INC_HAL8192DU_FW_IMG_WOWLAN_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/hal_com.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,146 @@
+/******************************************************************************
+ *
@@ -152673,9 +152965,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rp
+
+#endif //__HAL_COMMON_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/hal_intf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,432 @@
+/******************************************************************************
+ *
@@ -153109,9 +153401,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-r
+
+#endif //__HAL_INTF_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 2015-02-02 09:28:04.266056438 +0100
@@ -0,0 +1,137 @@
+/******************************************************************************
+ *
@@ -153250,9 +153542,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h lin
+ WLAN_PWR_CFG PwrCfgCmd[]);
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,477 @@
+/******************************************************************************
+ *
@@ -153731,9 +154023,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ieee80211.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1580 @@
+/******************************************************************************
+ *
@@ -155315,9 +155607,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-
+
+#endif /* IEEE80211_H */
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/if_ether.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,112 @@
+/******************************************************************************
+ *
@@ -155431,9 +155723,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-r
+
+
+#endif /* _LINUX_IF_ETHER_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,180 @@
+/******************************************************************************
+ *
@@ -155615,9 +155907,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h l
+
+#endif //__IOCTL_CFG80211_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/ip.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,141 @@
+/******************************************************************************
+ *
@@ -155760,9 +156052,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi-3.1
+};
+
+#endif /* _LINUX_IP_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/linux/wireless.h linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,90 @@
+/******************************************************************************
+ *
@@ -155854,9 +156146,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/linux/wireless.h l
+};
+
+#endif /* _LINUX_WIRELESS_H */
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
@@ -155898,9 +156190,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux
+
+#endif //_MLME_OSDEP_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,353 @@
+/******************************************************************************
+ *
@@ -156255,9 +156547,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/nic_spec.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
@@ -156306,9 +156598,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-r
+
+#endif // __RTL8711_SPEC_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,171 @@
+/******************************************************************************
+ *
@@ -156481,9 +156773,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h
+}
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,155 @@
+/******************************************************************************
+ *
@@ -156640,9 +156932,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux
+
+#endif //_OSDEP_INTF_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/osdep_service.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1815 @@
+/******************************************************************************
+ *
@@ -158459,9 +158751,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/osdep_service.h li
+#endif
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,168 @@
+/******************************************************************************
+ *
@@ -158631,9 +158923,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rp
+
+#endif //__PCIE_HAL_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_ops.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
@@ -158695,9 +158987,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rp
+#endif
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
@@ -158732,9 +159024,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,58 @@
+/******************************************************************************
+ *
@@ -158794,9 +159086,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux
+
+#endif //
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,153 @@
+/******************************************************************************
+ *
@@ -158951,9 +159243,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h lin
+
+#endif // __RTL8192C_CMD_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,516 @@
+/******************************************************************************
+ *
@@ -159471,9 +159763,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linu
+
+#endif //__HAL8190PCIDM_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,28 @@
+/******************************************************************************
+ *
@@ -159503,9 +159795,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h l
+#endif
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,937 @@
+/******************************************************************************
+ *
@@ -160444,9 +160736,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h lin
+
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,42 @@
+/******************************************************************************
+ *
@@ -160490,9 +160782,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h lin
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,184 @@
+/******************************************************************************
+ *
@@ -160678,9 +160970,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
@@ -160774,9 +161066,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linu
+
+#endif/* End of HalRf.h */
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1865 @@
+/******************************************************************************
+ *
@@ -162643,9 +162935,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,32 @@
+/******************************************************************************
+ *
@@ -162679,9 +162971,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h
+extern void rtl8192c_sreset_linked_status_check(_adapter *padapter);
+#endif
+#endif
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,129 @@
+/******************************************************************************
+ *
@@ -162812,9 +163104,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,142 @@
+/******************************************************************************
+ *
@@ -162958,9 +163250,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h lin
+#endif // __RTL8192D_CMD_H_
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,420 @@
+/******************************************************************************
+ *
@@ -163382,9 +163674,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linu
+VOID rtl8192d_dm_CheckTXPowerTracking(IN PADAPTER Adapter);
+
+#endif //__HAL8190PCIDM_H__
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1126 @@
+/******************************************************************************
+ *
@@ -164512,9 +164804,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h lin
+
+#endif //end CONFIG_MP_INCLUDED
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
@@ -164559,9 +164851,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h lin
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,187 @@
+/******************************************************************************
+ *
@@ -164750,9 +165042,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,97 @@
+/******************************************************************************
+ *
@@ -164851,9 +165143,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linu
+
+#endif/* End of HalRf.h */
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1841 @@
+/******************************************************************************
+ *
@@ -166696,9 +166988,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,145 @@
+/******************************************************************************
+ *
@@ -166845,9 +167137,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_android.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,90 @@
+/******************************************************************************
+ *
@@ -166939,9 +167231,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_android.h linu
+
+#endif //__RTW_ANDROID_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,64 @@
+/******************************************************************************
+ *
@@ -167007,9 +167299,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,76 @@
+/******************************************************************************
+ *
@@ -167087,9 +167379,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux
+
+#endif // _RTW_BR_EXT_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
@@ -167131,9 +167423,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h li
+
+#endif /* _RTL871X_BYTEORDER_H_ */
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,1167 @@
+/******************************************************************************
+ *
@@ -168302,9 +168594,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rp
+
+#endif // _CMD_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,538 @@
+/******************************************************************************
+ *
@@ -168844,9 +169136,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-
+
+#endif //__RTW_DEBUG_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -169000,9 +169292,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux
+#endif //PLATFORM_LINUX
+
+#endif //__RTL871X_EEPROM_H__
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,124 @@
+/******************************************************************************
+ *
@@ -169128,9 +169420,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_event.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,154 @@
+/******************************************************************************
+ *
@@ -169286,9 +169578,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-
+
+#endif // _WLANEVENT_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,50 @@
+/******************************************************************************
+ *
@@ -169340,9 +169632,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi
+
+#endif //_RTL871X_HT_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,269 @@
+/******************************************************************************
+ *
@@ -169613,9 +169905,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-
+
+#endif // #ifndef __INC_CEINFO_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,36 @@
+/******************************************************************************
+ *
@@ -169653,9 +169945,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,83 @@
+/******************************************************************************
+ *
@@ -169740,9 +170032,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h li
+
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,79 @@
+/******************************************************************************
+ *
@@ -169823,9 +170115,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_io.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,504 @@
+/******************************************************************************
+ *
@@ -170331,9 +170623,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi
+*/
+
+#endif //_RTL8711_IO_H_
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
@@ -170424,9 +170716,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_led.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,217 @@
+/******************************************************************************
+ *
@@ -170645,9 +170937,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rp
+
+#endif //__RTW_LED_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,963 @@
+/******************************************************************************
+ *
@@ -171612,9 +171904,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h lin
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,844 @@
+/******************************************************************************
+ *
@@ -172460,9 +172752,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-r
+#endif //CONFIG_INTEL_PROXIM
+#endif //__RTL871X_MLME_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,712 @@
+/******************************************************************************
+ *
@@ -173176,9 +173468,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi
+
+#endif //_RTW_MP_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 2015-02-02 09:28:04.270056438 +0100
@@ -0,0 +1,596 @@
+/******************************************************************************
+ *
@@ -173776,9 +174068,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h lin
+
+#endif
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,1097 @@
+/******************************************************************************
+ *
@@ -174877,9 +175169,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.
+
+#endif //__INC_HAL8192SPHYREG_H
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,161 @@
+/******************************************************************************
+ *
@@ -175042,9 +175334,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rp
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,362 @@
+/******************************************************************************
+ *
@@ -175408,9 +175700,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
@@ -175452,9 +175744,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rp
+
+#endif //_RTL871X_QOS_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,731 @@
+/******************************************************************************
+ *
@@ -176187,9 +176479,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-r
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -176343,9 +176635,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi
+
+#endif //_RTL8711_RF_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_security.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,447 @@
+/******************************************************************************
+ *
@@ -176794,9 +177086,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_security.h lin
+
+#endif //__RTL871X_SECURITY_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
@@ -176872,9 +177164,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,143 @@
+/******************************************************************************
+ *
@@ -177019,14 +177311,14 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-r
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_version.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1 @@
+#define DRIVERVERSION "v4.0.2_9000.20130911"
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,754 @@
+/******************************************************************************
+ *
@@ -177782,9 +178074,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-r
+
+#endif //_RTL871X_XMIT_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/sta_info.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,432 @@
+/******************************************************************************
+ *
@@ -178218,9 +178510,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-r
+
+#endif //_STA_INFO_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_hal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,37 @@
+/******************************************************************************
+ *
@@ -178259,9 +178551,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rp
+#endif //CONFIG_WOWLAN
+#endif //__USB_HAL_H__
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_ops.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,110 @@
+/******************************************************************************
+ *
@@ -178373,9 +178665,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rp
+
+#endif //__USB_OPS_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
@@ -178440,9 +178732,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h li
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
@@ -178482,9 +178774,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux
+
+#endif
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
@@ -178545,9 +178837,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/wifi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,1246 @@
+/******************************************************************************
+ *
@@ -179795,9 +180087,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi-3
+
+#endif // _WIFI_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,703 @@
+/******************************************************************************
+ *
@@ -180502,9 +180794,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linu
+
+#endif //#ifndef WLAN_BSSDEF_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
@@ -180601,9 +180893,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux
+
+#endif //__XMIT_OSDEP_H_
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,6 @@
+config RTL8192CU
+ tristate "Realtek 8192C USB WiFi"
@@ -180611,9 +180903,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi-3.18.x/d
+ ---help---
+ Help message of RTL8192CU
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/Makefile linux-rpi/drivers/net/wireless/rtl8192cu/Makefile
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/Makefile 2015-02-02 09:28:04.254056438 +0100
@@ -0,0 +1,616 @@
+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
+EXTRA_CFLAGS += -O1
@@ -181231,9 +181523,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/Makefile linux-rpi-3.18.x/
+ cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko
+endif
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,5489 @@
+/******************************************************************************
+ *
@@ -186724,9 +187016,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg8021
+
+#endif //CONFIG_IOCTL_CFG80211
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,11909 @@
+/******************************************************************************
+ *
@@ -198637,9 +198929,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c
+};
+#endif
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,586 @@
+/******************************************************************************
+ *
@@ -199227,9 +199519,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c
+#endif
+#endif
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,2749 @@
+/******************************************************************************
+ *
@@ -201980,9 +202272,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c li
+ free_netdev(ndev);
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,1997 @@
+/******************************************************************************
+ *
@@ -203981,9 +204273,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,24 @@
+/******************************************************************************
+ *
@@ -204009,9 +204301,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux
+
+
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,448 @@
+/******************************************************************************
+ *
@@ -204461,9 +204753,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c
+
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,839 @@
+/******************************************************************************
+ *
@@ -205304,9 +205596,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c
+}
+#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,1655 @@
+/******************************************************************************
+ *
@@ -206963,9 +207255,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,649 @@
+/******************************************************************************
+ *
@@ -207616,9 +207908,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux
+ }
+}
+
-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
+diff -Nur linux-3.18.5/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.5/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,421 @@
+/******************************************************************************
+ *
@@ -208041,9 +208333,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c
+ return _rtw_xmit_entry(pkt, pnetdev);
+}
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,2300 @@
+/******************************************************************************
+ *
@@ -210345,9 +210637,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/runwpa linux-rpi/drivers/net/wireless/rtl8192cu/runwpa
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/runwpa 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/runwpa 2015-02-02 09:28:04.274056438 +0100
@@ -0,0 +1,20 @@
+#!/bin/bash
+
@@ -210369,9 +210661,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/runwpa linux-rpi-3.18.x/dr
+fi
+
+
-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
+diff -Nur linux-3.18.5/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp
+--- linux-3.18.5/drivers/net/wireless/rtl8192cu/wlan0dhcp 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp 2015-02-02 09:28:04.278056438 +0100
@@ -0,0 +1,16 @@
+#!/bin/bash
+
@@ -210389,9 +210681,9 @@ diff -Nur linux-3.18.3/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.18.x
+
+echo "get ip: $var1"
+
-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
+diff -Nur linux-3.18.5/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c
+--- linux-3.18.5/drivers/of/fdt.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/of/fdt.c 2015-02-02 09:28:04.314056438 +0100
@@ -901,19 +901,38 @@
/* Retrieve command line */
@@ -210450,9 +210742,9 @@ diff -Nur linux-3.18.3/drivers/of/fdt.c linux-rpi-3.18.x/drivers/of/fdt.c
if (!d)
return -ENOENT;
-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
+diff -Nur linux-3.18.5/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c
+--- linux-3.18.5/drivers/pinctrl/pinctrl-bcm2835.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c 2015-02-02 09:28:04.346056439 +0100
@@ -382,7 +382,7 @@
.get = bcm2835_gpio_get,
.set = bcm2835_gpio_set,
@@ -210462,9 +210754,27 @@ diff -Nur linux-3.18.3/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi-3.18.x/driver
.ngpio = BCM2835_NUM_GPIOS,
.can_sleep = false,
};
-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
+diff -Nur linux-3.18.5/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307.c
+--- linux-3.18.5/drivers/rtc/rtc-ds1307.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/rtc/rtc-ds1307.c 2015-02-02 09:28:04.390056439 +0100
+@@ -1241,6 +1241,14 @@
+ return 0;
+ }
+
++#ifdef CONFIG_OF
++static const struct of_device_id ds1307_of_match[] = {
++ { .compatible = "maxim,ds1307" },
++ { }
++};
++MODULE_DEVICE_TABLE(of, ds1307_of_match);
++#endif
++
+ static struct i2c_driver ds1307_driver = {
+ .driver = {
+ .name = "rtc-ds1307",
+diff -Nur linux-3.18.5/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig
+--- linux-3.18.5/drivers/spi/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/spi/Kconfig 2015-02-02 09:28:04.538056440 +0100
@@ -77,7 +77,7 @@
config SPI_BCM2835
@@ -210489,9 +210799,9 @@ diff -Nur linux-3.18.3/drivers/spi/Kconfig linux-rpi-3.18.x/drivers/spi/Kconfig
config SPI_BFIN5XX
tristate "SPI controller driver for ADI Blackfin5xx"
depends on BLACKFIN && !BF60x
-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
+diff -Nur linux-3.18.5/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile
+--- linux-3.18.5/drivers/spi/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/spi/Makefile 2015-02-02 09:28:04.538056440 +0100
@@ -20,6 +20,7 @@
obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o
obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o
@@ -210500,9 +210810,9 @@ diff -Nur linux-3.18.3/drivers/spi/Makefile linux-rpi-3.18.x/drivers/spi/Makefil
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.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
+diff -Nur linux-3.18.5/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c
+--- linux-3.18.5/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/spi/spi-bcm2708.c 2015-02-02 09:28:04.538056440 +0100
@@ -0,0 +1,635 @@
+/*
+ * Driver for Broadcom BCM2708 SPI Controllers
@@ -211139,9 +211449,9 @@ diff -Nur linux-3.18.3/drivers/spi/spi-bcm2708.c linux-rpi-3.18.x/drivers/spi/sp
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-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
+diff -Nur linux-3.18.5/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig
+--- linux-3.18.5/drivers/staging/media/lirc/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/staging/media/lirc/Kconfig 2015-02-02 09:28:04.634056440 +0100
@@ -38,6 +38,12 @@
help
Driver for Homebrew Parallel Port Receivers
@@ -211155,9 +211465,9 @@ diff -Nur linux-3.18.3/drivers/staging/media/lirc/Kconfig linux-rpi-3.18.x/drive
config LIRC_SASEM
tristate "Sasem USB IR Remote"
depends on LIRC && USB
-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
+diff -Nur linux-3.18.5/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c
+--- linux-3.18.5/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2015-02-02 09:28:04.634056440 +0100
@@ -0,0 +1,757 @@
+/*
+ * lirc_rpi.c
@@ -211916,9 +212226,9 @@ diff -Nur linux-3.18.3/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.18.x/dr
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
-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
+diff -Nur linux-3.18.5/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile
+--- linux-3.18.5/drivers/staging/media/lirc/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/staging/media/lirc/Makefile 2015-02-02 09:28:04.634056440 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
@@ -211927,9 +212237,9 @@ diff -Nur linux-3.18.3/drivers/staging/media/lirc/Makefile linux-rpi-3.18.x/driv
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.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
+diff -Nur linux-3.18.5/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c
+--- linux-3.18.5/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2015-02-02 09:28:04.726056441 +0100
@@ -0,0 +1,184 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -212115,9 +212425,9 @@ diff -Nur linux-3.18.3/drivers/thermal/bcm2835-thermal.c linux-rpi-3.18.x/driver
+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_thermal_driver);
-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
+diff -Nur linux-3.18.5/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig
+--- linux-3.18.5/drivers/thermal/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/thermal/Kconfig 2015-02-02 09:28:04.726056441 +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.
@@ -212131,9 +212441,9 @@ diff -Nur linux-3.18.3/drivers/thermal/Kconfig linux-rpi-3.18.x/drivers/thermal/
config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
depends on X86_THERMAL_VECTOR
-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
+diff -Nur linux-3.18.5/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile
+--- linux-3.18.5/drivers/thermal/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/thermal/Makefile 2015-02-02 09:28:04.726056441 +0100
@@ -29,6 +29,7 @@
obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
@@ -212142,9 +212452,9 @@ diff -Nur linux-3.18.3/drivers/thermal/Makefile linux-rpi-3.18.x/drivers/thermal
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.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
+diff -Nur linux-3.18.5/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c
+--- linux-3.18.5/drivers/tty/serial/amba-pl011.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/tty/serial/amba-pl011.c 2015-02-02 09:28:04.738056441 +0100
@@ -84,7 +84,7 @@
static unsigned int get_fifosize_arm(struct amba_device *dev)
@@ -212154,9 +212464,9 @@ diff -Nur linux-3.18.3/drivers/tty/serial/amba-pl011.c linux-rpi-3.18.x/drivers/
}
static struct vendor_data vendor_arm = {
-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
+diff -Nur linux-3.18.5/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c
+--- linux-3.18.5/drivers/usb/core/generic.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/core/generic.c 2015-02-02 09:28:04.762056441 +0100
@@ -152,6 +152,7 @@
dev_warn(&udev->dev,
"no configuration chosen from %d choice%s\n",
@@ -212165,9 +212475,9 @@ diff -Nur linux-3.18.3/drivers/usb/core/generic.c linux-rpi-3.18.x/drivers/usb/c
}
return i;
}
-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
+diff -Nur linux-3.18.5/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c
+--- linux-3.18.5/drivers/usb/core/hub.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/core/hub.c 2015-02-02 09:28:04.762056441 +0100
@@ -4923,7 +4923,7 @@
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused;
@@ -212177,9 +212487,9 @@ diff -Nur linux-3.18.3/drivers/usb/core/hub.c linux-rpi-3.18.x/drivers/usb/core/
usb_clear_port_feature(hdev, port1,
USB_PORT_FEAT_C_OVER_CURRENT);
msleep(100); /* Cool down */
-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
+diff -Nur linux-3.18.5/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c
+--- linux-3.18.5/drivers/usb/core/message.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/core/message.c 2015-02-02 09:28:04.766056441 +0100
@@ -1889,6 +1889,85 @@
if (cp->string == NULL &&
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
@@ -212266,9 +212576,9 @@ diff -Nur linux-3.18.3/drivers/usb/core/message.c linux-rpi-3.18.x/drivers/usb/c
/* Now that the interfaces are installed, re-enable LPM. */
usb_unlocked_enable_lpm(dev);
-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
+diff -Nur linux-3.18.5/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h
+--- linux-3.18.5/drivers/usb/core/otg_whitelist.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/core/otg_whitelist.h 2015-02-02 09:28:04.766056441 +0100
@@ -19,87 +19,153 @@
static struct usb_device_id whitelist_table [] = {
@@ -212472,9 +212782,9 @@ diff -Nur linux-3.18.3/drivers/usb/core/otg_whitelist.h linux-rpi-3.18.x/drivers
return 0;
}
-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
+diff -Nur linux-3.18.5/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c
+--- linux-3.18.5/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/gadget/file_storage.c 2015-02-02 09:28:04.770056441 +0100
@@ -0,0 +1,3676 @@
+/*
+ * file_storage.c -- File-backed USB Storage Gadget, for USB development
@@ -216152,9 +216462,9 @@ diff -Nur linux-3.18.3/drivers/usb/gadget/file_storage.c linux-rpi-3.18.x/driver
+ kref_put(&fsg->ref, fsg_release);
+}
+module_exit(fsg_cleanup);
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/changes.txt 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,174 @@
+
+dwc_read_reg32() and friends now take an additional parameter, a pointer to an
@@ -216330,9 +216640,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.
+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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,270 @@
+# Doxyfile 1.4.5
+
@@ -216604,9 +216914,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,532 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
@@ -217140,9 +217450,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.18.
+}
+
+#endif /* DWC_CCLIB */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,224 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
@@ -217368,9 +217678,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.18.
+#endif
+
+#endif /* _DWC_CC_H_ */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1308 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -218680,9 +218990,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-
+{
+ return wq->pending;
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1440 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
@@ -220124,9 +220434,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux
+MODULE_LICENSE ("GPL");
+
+#endif /* DWC_LIBMODULE */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1275 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -221403,9 +221713,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-
+{
+ return wq->pending;
+}
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,308 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
@@ -221715,9 +222025,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3
+}
+
+#endif /* DWC_CRYPTOLIB */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,111 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
@@ -221830,9 +222140,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3
+#endif
+
+#endif /* _DWC_CRYPTO_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,291 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
@@ -222125,9 +222435,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.18.
+#endif /* !CONFIG_MACH_IPMATE */
+
+#endif /* DWC_CRYPTOLIB */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,106 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
@@ -222235,9 +222545,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.18.
+#endif
+
+#endif /* _DWC_DH_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h 2015-02-02 09:28:04.786056441 +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 $ */
@@ -222833,9 +223143,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.1
+#endif
+
+#endif /* _DWC_LIST_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,245 @@
+/* Memory Debugging */
+#ifdef DWC_DEBUG_MEMORY
@@ -223082,9 +223392,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.18
+}
+
+#endif /* DWC_DEBUG_MEMORY */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,636 @@
+/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows.
+ *
@@ -223722,9 +224032,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3
+#endif /* CONFIG_MACH_IPMATE */
+
+#endif /*DWC_CRYPTOLIB */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,34 @@
+/*
+ * dwc_modpow.h
@@ -223760,9 +224070,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3
+#endif
+
+#endif /* _LINUX_BIGNUM_H */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,319 @@
+#ifdef DWC_NOTIFYLIB
+
@@ -224083,9 +224393,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi
+}
+
+#endif /* DWC_NOTIFYLIB */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,122 @@
+
+#ifndef __DWC_NOTIFIER_H__
@@ -224209,9 +224519,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi
+#endif
+
+#endif /* __DWC_NOTIFIER_H__ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1276 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
@@ -225489,9 +225799,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.18.
+#endif
+
+#endif /* _DWC_OS_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,58 @@
+#
+# Makefile for DWC_common library
@@ -225551,9 +225861,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.18.
+
+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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,17 @@
+CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
+CFLAGS += -DDWC_FREEBSD
@@ -225572,9 +225882,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,49 @@
+#
+# Makefile for DWC_common library
@@ -225625,9 +225935,9 @@ diff -Nur linux-3.18.3/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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h
+--- linux-3.18.5/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_common_port/usb.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,946 @@
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -226575,9 +226885,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.18.x/d
+#endif
+
+#endif /* _USB_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg
+--- linux-3.18.5/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,224 @@
+# Doxyfile 1.3.9.1
+
@@ -226803,9 +227113,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.18.x
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1575 @@
+/*
+ * zero.c -- Gadget Zero, for USB development
@@ -228382,9 +228692,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.18.x/d
+ remove_proc_entry("isoc_test", NULL);
+}
+module_exit (cleanup);
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,142 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -228528,9 +228838,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.18.
+typedef struct cfi_string cfi_string_t;
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,854 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
@@ -229386,9 +229696,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.18.x/d
+#endif
+ return 1;
+}
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,80 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
@@ -229470,9 +229780,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.18.x/d
+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.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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1210 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
@@ -230684,9 +230994,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.18.x/
+ device_remove_file(&dev->dev, &dev_attr_sleep_status);
+#endif
+}
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,89 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
@@ -230777,9 +231087,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.18.x/
+#endif
+ );
+#endif
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,1876 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -232657,9 +232967,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.18.x/d
+}
+
+#endif //DWC_UTE_CFI
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,320 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -232981,9 +233291,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.18.x/d
+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl);
+
+#endif /* (__DWC_OTG_CFI_H__) */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,7151 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
@@ -240136,9 +240446,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.18.x/d
+ dwc_otg_pcd_start_srp_timer(core_if);
+ return;
+}
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,1464 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
@@ -241604,9 +241914,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.18.x/d
+//////////////////////////////////////////////////////////////////////
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,1594 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
@@ -243202,9 +243512,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.1
+ DWC_SPINUNLOCK(core_if->lock);
+ return retval;
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,705 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
@@ -243911,9 +244221,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.18
+/** @} */
+
+#endif /* __DWC_CORE_IF_H__ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,117 @@
+/* ==========================================================================
+ *
@@ -244032,9 +244342,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.18.x/d
+
+#endif /*DEBUG*/
+#endif
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,1749 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
@@ -245785,9 +246095,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.18.
+ </td></tr>
+
+*/
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,86 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
@@ -245875,9 +246185,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.18.
+#endif
+
+#endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,1294 @@
+/*
+ * dwc_otg_fiq_fsm.c - The finite state machine FIQ
@@ -247173,9 +247483,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi-3.18
+ state->fiq_done++;
+ mb();
+}
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,353 @@
+/*
+ * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions
@@ -247530,9 +247840,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi-3.18
+extern void dwc_otg_fiq_nop(struct fiq_state *state);
+
+#endif /* DWC_OTG_FIQ_FSM_H_ */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,81 @@
+/*
+ * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ
@@ -247615,9 +247925,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi-3.1
+_dwc_otg_fiq_stub_end:
+END(_dwc_otg_fiq_stub)
+
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,4217 @@
+
+/* ==========================================================================
@@ -251836,9 +252146,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.18.x/d
+}
+
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,1132 @@
+/*==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
@@ -252972,9 +253282,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.1
+}
+
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,862 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
@@ -253838,9 +254148,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.18.x/d
+#endif
+#endif
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,417 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
@@ -254259,9 +254569,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.18.
+
+#endif /* __DWC_HCD_IF_H__ */
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,2688 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
@@ -256951,9 +257261,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.1
+ return retval;
+}
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,985 @@
+
+/* ==========================================================================
@@ -257940,9 +258250,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.
+}
+
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,943 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
@@ -258887,9 +259197,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.
+}
+
+#endif /* DWC_DEVICE_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,188 @@
+#ifndef _DWC_OS_DEP_H_
+#define _DWC_OS_DEP_H_
@@ -259079,9 +259389,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.18.
+
+
+#endif /* _DWC_OS_DEP_H_ */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,2712 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
@@ -261795,9 +262105,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.18.x/d
+}
+
+#endif /* DWC_HOST_ONLY */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,266 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
@@ -262065,9 +262375,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.18.x/d
+extern void do_test_mode(void *data);
+#endif
+#endif /* DWC_HOST_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,360 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
@@ -262429,9 +262739,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.18.
+#endif /* __DWC_PCD_IF_H__ */
+
+#endif /* DWC_HOST_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2015-02-02 09:28:04.790056441 +0100
@@ -0,0 +1,5147 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
@@ -267580,9 +267890,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.1
+}
+
+#endif /* DWC_HOST_ONLY */
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,1360 @@
+ /* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
@@ -268944,9 +269254,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.
+EXPORT_SYMBOL(usb_gadget_unregister_driver);
+
+#endif /* DWC_HOST_ONLY */
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h
+--- linux-3.18.5/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,2550 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
@@ -271498,9 +271808,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.18.x/
+} gpwrdn_data_t;
+
+#endif
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile
+--- linux-3.18.5/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2015-02-02 09:28:04.786056441 +0100
@@ -0,0 +1,82 @@
+#
+# Makefile for DWC_otg Highspeed USB controller driver
@@ -271584,9 +271894,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.18.x/driver
+ rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers
+
+endif
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,337 @@
+package dwc_otg_test;
+
@@ -271925,9 +272235,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3
+);
+
+1;
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile
+--- linux-3.18.5/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,16 @@
+
+PERL=/usr/bin/perl
@@ -271945,9 +272255,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.18.x/d
+ else echo "=======> $$test, FAILED" ; \
+ fi \
+ done
-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
+diff -Nur linux-3.18.5/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.5/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,133 @@
+#!/usr/bin/perl -w
+#
@@ -272082,9 +272392,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi
+
+test_main();
+0;
-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
+diff -Nur linux-3.18.5/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl
+--- linux-3.18.5/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2015-02-02 09:28:04.794056441 +0100
@@ -0,0 +1,193 @@
+#!/usr/bin/perl -w
+#
@@ -272279,9 +272589,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.1
+
+test_main();
+0;
-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
+diff -Nur linux-3.18.5/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig
+--- linux-3.18.5/drivers/usb/host/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/host/Kconfig 2015-02-02 09:28:04.786056441 +0100
@@ -744,6 +744,19 @@
To compile this driver a module, choose M here: the module
will be called "hwa-hc".
@@ -272302,9 +272612,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/Kconfig linux-rpi-3.18.x/drivers/usb/hos
config USB_IMX21_HCD
tristate "i.MX21 HCD support"
depends on ARM && ARCH_MXC
-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
+diff -Nur linux-3.18.5/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile
+--- linux-3.18.5/drivers/usb/host/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/host/Makefile 2015-02-02 09:28:04.786056441 +0100
@@ -71,6 +71,8 @@
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
@@ -272314,9 +272624,9 @@ diff -Nur linux-3.18.3/drivers/usb/host/Makefile linux-rpi-3.18.x/drivers/usb/ho
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.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
+diff -Nur linux-3.18.5/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile
+--- linux-3.18.5/drivers/usb/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/usb/Makefile 2015-02-02 09:28:04.758056441 +0100
@@ -24,6 +24,7 @@
obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/
@@ -272325,9 +272635,9 @@ diff -Nur linux-3.18.3/drivers/usb/Makefile linux-rpi-3.18.x/drivers/usb/Makefil
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.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
+diff -Nur linux-3.18.5/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c
+--- linux-3.18.5/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2015-02-02 09:28:04.850056441 +0100
@@ -0,0 +1,818 @@
+/*
+ * linux/drivers/video/bcm2708_fb.c
@@ -273147,9 +273457,9 @@ diff -Nur linux-3.18.3/drivers/video/fbdev/bcm2708_fb.c linux-rpi-3.18.x/drivers
+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.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
+diff -Nur linux-3.18.5/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c
+--- linux-3.18.5/drivers/video/fbdev/core/cfbimgblt.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2015-02-02 09:28:04.854056441 +0100
@@ -28,6 +28,11 @@
*
* Also need to add code to deal with cards endians that are different than
@@ -273323,9 +273633,9 @@ diff -Nur linux-3.18.3/drivers/video/fbdev/core/cfbimgblt.c linux-rpi-3.18.x/dri
slow_imageblit(image, p, dst1, fgcolor, bgcolor,
start_index, pitch_index);
} else
-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
+diff -Nur linux-3.18.5/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c
+--- linux-3.18.5/drivers/video/fbdev/core/fbmem.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2015-02-02 09:28:04.854056441 +0100
@@ -1084,6 +1084,25 @@
}
EXPORT_SYMBOL(fb_blank);
@@ -273384,9 +273694,9 @@ diff -Nur linux-3.18.3/drivers/video/fbdev/core/fbmem.c linux-rpi-3.18.x/drivers
arg = (unsigned long) compat_ptr(arg);
case FBIOBLANK:
ret = do_fb_ioctl(info, cmd, arg);
-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
+diff -Nur linux-3.18.5/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig
+--- linux-3.18.5/drivers/video/fbdev/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/video/fbdev/Kconfig 2015-02-02 09:28:04.846056441 +0100
@@ -224,6 +224,20 @@
comment "Frame buffer hardware drivers"
depends on FB
@@ -273408,9 +273718,9 @@ diff -Nur linux-3.18.3/drivers/video/fbdev/Kconfig linux-rpi-3.18.x/drivers/vide
config FB_GRVGA
tristate "Aeroflex Gaisler framebuffer support"
depends on FB && SPARC
-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
+diff -Nur linux-3.18.5/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile
+--- linux-3.18.5/drivers/video/fbdev/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/video/fbdev/Makefile 2015-02-02 09:28:04.846056441 +0100
@@ -12,6 +12,7 @@
obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o
@@ -273419,9 +273729,9 @@ diff -Nur linux-3.18.3/drivers/video/fbdev/Makefile linux-rpi-3.18.x/drivers/vid
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.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
+diff -Nur linux-3.18.5/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.18.5/drivers/video/logo/logo_linux_clut224.ppm 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2015-02-02 09:28:04.890056442 +0100
@@ -1,1604 +1,883 @@
P3
-# Standard 224-color Linux logo
@@ -275908,9 +276218,9 @@ diff -Nur linux-3.18.3/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.18.
+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.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
+diff -Nur linux-3.18.5/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c
+--- linux-3.18.5/drivers/w1/masters/w1-gpio.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/w1/masters/w1-gpio.c 2015-02-02 09:28:04.894056442 +0100
@@ -23,6 +23,15 @@
#include "../w1.h"
#include "../w1_int.h"
@@ -276010,9 +276320,9 @@ diff -Nur linux-3.18.3/drivers/w1/masters/w1-gpio.c linux-rpi-3.18.x/drivers/w1/
return 0;
}
-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
+diff -Nur linux-3.18.5/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h
+--- linux-3.18.5/drivers/w1/w1.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/w1/w1.h 2015-02-02 09:28:04.898056442 +0100
@@ -171,6 +171,12 @@
u8 (*set_pullup)(void *, int);
@@ -276026,9 +276336,9 @@ diff -Nur linux-3.18.3/drivers/w1/w1.h linux-rpi-3.18.x/drivers/w1/w1.h
void (*search)(void *, struct w1_master *,
u8, w1_slave_found_callback);
};
-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
+diff -Nur linux-3.18.5/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c
+--- linux-3.18.5/drivers/w1/w1_int.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/w1/w1_int.c 2015-02-02 09:28:04.898056442 +0100
@@ -123,6 +123,20 @@
return(-EINVAL);
}
@@ -276050,9 +276360,9 @@ diff -Nur linux-3.18.3/drivers/w1/w1_int.c linux-rpi-3.18.x/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.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
+diff -Nur linux-3.18.5/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c
+--- linux-3.18.5/drivers/w1/w1_io.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/w1/w1_io.c 2015-02-02 09:28:04.898056442 +0100
@@ -134,10 +134,22 @@
static void w1_post_write(struct w1_master *dev)
{
@@ -276079,9 +276389,9 @@ diff -Nur linux-3.18.3/drivers/w1/w1_io.c linux-rpi-3.18.x/drivers/w1/w1_io.c
dev->pullup_duration = 0;
}
}
-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
+diff -Nur linux-3.18.5/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c
+--- linux-3.18.5/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2015-02-02 09:28:04.898056442 +0100
@@ -0,0 +1,382 @@
+/*
+ * Broadcom BCM2708 watchdog driver.
@@ -276465,9 +276775,9 @@ diff -Nur linux-3.18.3/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.18.x/drivers/
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS_MISCDEV(TEMP_MINOR);
+MODULE_LICENSE("GPL");
-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
+diff -Nur linux-3.18.5/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig
+--- linux-3.18.5/drivers/watchdog/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/watchdog/Kconfig 2015-02-02 09:28:04.898056442 +0100
@@ -452,6 +452,12 @@
To compile this driver as a module, choose M here: the
module will be called retu_wdt.
@@ -276481,9 +276791,9 @@ diff -Nur linux-3.18.3/drivers/watchdog/Kconfig linux-rpi-3.18.x/drivers/watchdo
config MOXART_WDT
tristate "MOXART watchdog"
depends on ARCH_MOXART
-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
+diff -Nur linux-3.18.5/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile
+--- linux-3.18.5/drivers/watchdog/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/drivers/watchdog/Makefile 2015-02-02 09:28:04.898056442 +0100
@@ -56,6 +56,7 @@
obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
@@ -276492,9 +276802,9 @@ diff -Nur linux-3.18.3/drivers/watchdog/Makefile linux-rpi-3.18.x/drivers/watchd
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.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
+diff -Nur linux-3.18.5/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h
+--- linux-3.18.5/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/include/linux/broadcom/vc_cma.h 2015-02-02 09:28:05.138056443 +0100
@@ -0,0 +1,29 @@
+/*****************************************************************************
+* Copyright 2012 Broadcom Corporation. All rights reserved.
@@ -276525,9 +276835,9 @@ diff -Nur linux-3.18.3/include/linux/broadcom/vc_cma.h linux-rpi-3.18.x/include/
+#endif
+
+#endif /* VC_CMA_H */
-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
+diff -Nur linux-3.18.5/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h
+--- linux-3.18.5/include/linux/mmc/host.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/include/linux/mmc/host.h 2015-02-02 09:28:05.178056443 +0100
@@ -290,6 +290,7 @@
#define MMC_CAP2_HS400 (MMC_CAP2_HS400_1_8V | \
MMC_CAP2_HS400_1_2V)
@@ -276536,9 +276846,9 @@ diff -Nur linux-3.18.3/include/linux/mmc/host.h linux-rpi-3.18.x/include/linux/m
mmc_pm_flag_t pm_caps; /* supported pm features */
-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
+diff -Nur linux-3.18.5/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h
+--- linux-3.18.5/include/linux/mmc/sdhci.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/include/linux/mmc/sdhci.h 2015-02-02 09:28:05.182056443 +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 */
@@ -276547,9 +276857,9 @@ diff -Nur linux-3.18.3/include/linux/mmc/sdhci.h linux-rpi-3.18.x/include/linux/
unsigned int version; /* SDHCI spec. version */
-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
+diff -Nur linux-3.18.5/include/linux/platform_data/bcm2708.h linux-rpi/include/linux/platform_data/bcm2708.h
+--- linux-3.18.5/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/include/linux/platform_data/bcm2708.h 2015-02-02 09:28:05.194056443 +0100
@@ -0,0 +1,23 @@
+/*
+ * include/linux/platform_data/bcm2708.h
@@ -276574,9 +276884,9 @@ diff -Nur linux-3.18.3/include/linux/platform_data/bcm2708.h linux-rpi-3.18.x/in
+ bcm2708_gpio_pull_t value);
+
+#endif
-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
+diff -Nur linux-3.18.5/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h
+--- linux-3.18.5/include/linux/vmstat.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/include/linux/vmstat.h 2015-02-02 09:28:05.222056444 +0100
@@ -241,7 +241,11 @@
static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
{
@@ -276589,9 +276899,9 @@ diff -Nur linux-3.18.3/include/linux/vmstat.h linux-rpi-3.18.x/include/linux/vms
}
static inline void __inc_zone_page_state(struct page *page,
-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
+diff -Nur linux-3.18.5/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h
+--- linux-3.18.5/include/uapi/linux/fb.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/include/uapi/linux/fb.h 2015-02-02 09:28:05.266056444 +0100
@@ -34,6 +34,11 @@
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
@@ -276604,9 +276914,9 @@ diff -Nur linux-3.18.3/include/uapi/linux/fb.h linux-rpi-3.18.x/include/uapi/lin
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
-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
+diff -Nur linux-3.18.5/kernel/cgroup.c linux-rpi/kernel/cgroup.c
+--- linux-3.18.5/kernel/cgroup.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/kernel/cgroup.c 2015-02-02 09:28:05.302056444 +0100
@@ -5322,6 +5322,29 @@
}
__setup("cgroup_disable=", cgroup_disable);
@@ -276637,9 +276947,9 @@ diff -Nur linux-3.18.3/kernel/cgroup.c linux-rpi-3.18.x/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.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
+diff -Nur linux-3.18.5/mm/memcontrol.c linux-rpi/mm/memcontrol.c
+--- linux-3.18.5/mm/memcontrol.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/mm/memcontrol.c 2015-02-02 09:28:05.350056444 +0100
@@ -6207,6 +6207,7 @@
.bind = mem_cgroup_bind,
.legacy_cftypes = mem_cgroup_files,
@@ -276648,9 +276958,5175 @@ diff -Nur linux-3.18.3/mm/memcontrol.c linux-rpi-3.18.x/mm/memcontrol.c
};
#ifdef CONFIG_MEMCG_SWAP
-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
+diff -Nur linux-3.18.5/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c
+--- linux-3.18.5/scripts/dtc/checks.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/checks.c 2015-02-02 09:28:05.510056445 +0100
+@@ -53,7 +53,7 @@
+ void *data;
+ bool warn, error;
+ enum checkstatus status;
+- int inprogress;
++ bool inprogress;
+ int num_prereqs;
+ struct check **prereq;
+ };
+@@ -113,6 +113,7 @@
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+ }
++ va_end(ap);
+ }
+
+ #define FAIL(c, ...) \
+@@ -141,9 +142,9 @@
+ check_nodes_props(c, dt, child);
+ }
+
+-static int run_check(struct check *c, struct node *dt)
++static bool run_check(struct check *c, struct node *dt)
+ {
+- int error = 0;
++ bool error = false;
+ int i;
+
+ assert(!c->inprogress);
+@@ -151,11 +152,11 @@
+ if (c->status != UNCHECKED)
+ goto out;
+
+- c->inprogress = 1;
++ c->inprogress = true;
+
+ for (i = 0; i < c->num_prereqs; i++) {
+ struct check *prq = c->prereq[i];
+- error |= run_check(prq, dt);
++ error = error || run_check(prq, dt);
+ if (prq->status != PASSED) {
+ c->status = PREREQ;
+ check_msg(c, "Failed prerequisite '%s'",
+@@ -177,9 +178,9 @@
+ TRACE(c, "\tCompleted, status %d", c->status);
+
+ out:
+- c->inprogress = 0;
++ c->inprogress = false;
+ if ((c->status != PASSED) && (c->error))
+- error = 1;
++ error = true;
+ return error;
+ }
+
+@@ -457,22 +458,93 @@
+ struct node *node, struct property *prop)
+ {
+ struct marker *m = prop->val.markers;
++ struct fixup *f, **fp;
++ struct fixup_entry *fe, **fep;
+ struct node *refnode;
+ cell_t phandle;
++ int has_phandle_refs;
++
++ has_phandle_refs = 0;
++ for_each_marker_of_type(m, REF_PHANDLE) {
++ has_phandle_refs = 1;
++ break;
++ }
++
++ if (!has_phandle_refs)
++ return;
+
+ for_each_marker_of_type(m, REF_PHANDLE) {
+ assert(m->offset + sizeof(cell_t) <= prop->val.len);
+
+ refnode = get_node_by_ref(dt, m->ref);
+- if (! refnode) {
++ if (!refnode && !symbol_fixup_support) {
+ FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+- m->ref);
++ m->ref);
+ continue;
+ }
+
+- phandle = get_node_phandle(dt, refnode);
+- *((cell_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);
++ if (!refnode) {
++ /* allocate fixup entry */
++ fe = xmalloc(sizeof(*fe));
++
++ fe->node = node;
++ fe->prop = prop;
++ fe->offset = m->offset;
++ fe->next = NULL;
++
++ /* search for an already existing fixup */
++ for_each_fixup(dt, f)
++ if (strcmp(f->ref, m->ref) == 0)
++ break;
++
++ /* no fixup found, add new */
++ if (f == NULL) {
++ f = xmalloc(sizeof(*f));
++ f->ref = m->ref;
++ f->entries = NULL;
++ f->next = NULL;
++
++ /* add it to the tree */
++ fp = &dt->fixups;
++ while (*fp)
++ fp = &(*fp)->next;
++ *fp = f;
++ }
++
++ /* and now append fixup entry */
++ fep = &f->entries;
++ while (*fep)
++ fep = &(*fep)->next;
++ *fep = fe;
++
++ /* mark the entry as unresolved */
++ phandle = 0xdeadbeef;
++ } else {
++ phandle = get_node_phandle(dt, refnode);
++
++ /* if it's a plugin, we need to record it */
++ if (symbol_fixup_support && dt->is_plugin) {
++
++ /* allocate a new local fixup entry */
++ fe = xmalloc(sizeof(*fe));
++
++ fe->node = node;
++ fe->prop = prop;
++ fe->offset = m->offset;
++ fe->next = NULL;
++
++ /* append it to the local fixups */
++ fep = &dt->local_fixups;
++ while (*fep)
++ fep = &(*fep)->next;
++ *fep = fe;
++ }
++ }
++
++ *((cell_t *)(prop->val.val + m->offset)) =
++ cpu_to_fdt32(phandle);
+ }
++
+ }
+ ERROR(phandle_references, NULL, NULL, fixup_phandle_references, NULL,
+ &duplicate_node_names, &explicit_phandles);
+@@ -624,11 +696,11 @@
+ if (!reg && !ranges)
+ return;
+
+- if ((node->parent->addr_cells == -1))
++ if (node->parent->addr_cells == -1)
+ FAIL(c, "Relying on default #address-cells value for %s",
+ node->fullpath);
+
+- if ((node->parent->size_cells == -1))
++ if (node->parent->size_cells == -1)
+ FAIL(c, "Relying on default #size-cells value for %s",
+ node->fullpath);
+ }
+@@ -651,6 +723,45 @@
+ }
+ TREE_WARNING(obsolete_chosen_interrupt_controller, NULL);
+
++static void check_auto_label_phandles(struct check *c, struct node *dt,
++ struct node *node)
++{
++ struct label *l;
++ struct symbol *s, **sp;
++ int has_label;
++
++ if (!symbol_fixup_support)
++ return;
++
++ has_label = 0;
++ for_each_label(node->labels, l) {
++ has_label = 1;
++ break;
++ }
++
++ if (!has_label)
++ return;
++
++ /* force allocation of a phandle for this node */
++ (void)get_node_phandle(dt, node);
++
++ /* add the symbol */
++ for_each_label(node->labels, l) {
++
++ s = xmalloc(sizeof(*s));
++ s->label = l;
++ s->node = node;
++ s->next = NULL;
++
++ /* add it to the symbols list */
++ sp = &dt->symbols;
++ while (*sp)
++ sp = &((*sp)->next);
++ *sp = s;
++ }
++}
++NODE_WARNING(auto_label_phandles, NULL);
++
+ static struct check *check_table[] = {
+ &duplicate_node_names, &duplicate_property_names,
+ &node_name_chars, &node_name_format, &property_name_chars,
+@@ -669,6 +780,8 @@
+ &avoid_default_addr_size,
+ &obsolete_chosen_interrupt_controller,
+
++ &auto_label_phandles,
++
+ &always_fail,
+ };
+
+@@ -706,15 +819,15 @@
+ c->error = c->error && !error;
+ }
+
+-void parse_checks_option(bool warn, bool error, const char *optarg)
++void parse_checks_option(bool warn, bool error, const char *arg)
+ {
+ int i;
+- const char *name = optarg;
++ const char *name = arg;
+ bool enable = true;
+
+- if ((strncmp(optarg, "no-", 3) == 0)
+- || (strncmp(optarg, "no_", 3) == 0)) {
+- name = optarg + 3;
++ if ((strncmp(arg, "no-", 3) == 0)
++ || (strncmp(arg, "no_", 3) == 0)) {
++ name = arg + 3;
+ enable = false;
+ }
+
+@@ -733,7 +846,7 @@
+ die("Unrecognized check name \"%s\"\n", name);
+ }
+
+-void process_checks(int force, struct boot_info *bi)
++void process_checks(bool force, struct boot_info *bi)
+ {
+ struct node *dt = bi->dt;
+ int i;
+diff -Nur linux-3.18.5/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c
+--- linux-3.18.5/scripts/dtc/data.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/data.c 2015-02-02 09:28:05.510056445 +0100
+@@ -74,7 +74,7 @@
+ struct data d;
+ char *q;
+
+- d = data_grow_for(empty_data, strlen(s)+1);
++ d = data_grow_for(empty_data, len + 1);
+
+ q = d.val;
+ while (i < len) {
+@@ -250,20 +250,20 @@
+ return data_append_markers(d, m);
+ }
+
+-int data_is_one_string(struct data d)
++bool data_is_one_string(struct data d)
+ {
+ int i;
+ int len = d.len;
+
+ if (len == 0)
+- return 0;
++ return false;
+
+ for (i = 0; i < len-1; i++)
+ if (d.val[i] == '\0')
+- return 0;
++ return false;
+
+ if (d.val[len-1] != '\0')
+- return 0;
++ return false;
+
+- return 1;
++ return true;
+ }
+diff -Nur linux-3.18.5/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c
+--- linux-3.18.5/scripts/dtc/dtc.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc.c 2015-02-02 09:28:05.514056445 +0100
+@@ -29,6 +29,7 @@
+ int minsize; /* Minimum blob size */
+ int padsize; /* Additional padding to blob */
+ int phandle_format = PHANDLE_BOTH; /* Use linux,phandle or phandle properties */
++int symbol_fixup_support = 0;
+
+ static void fill_fullpaths(struct node *tree, const char *prefix)
+ {
+@@ -48,8 +49,10 @@
+ }
+
+ /* Usage related data. */
++#define FDT_VERSION(version) _FDT_VERSION(version)
++#define _FDT_VERSION(version) #version
+ static const char usage_synopsis[] = "dtc [options] <input file>";
+-static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:hv";
++static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:hv@";
+ static struct option const usage_long_opts[] = {
+ {"quiet", no_argument, NULL, 'q'},
+ {"in-format", a_argument, NULL, 'I'},
+@@ -67,6 +70,7 @@
+ {"phandle", a_argument, NULL, 'H'},
+ {"warning", a_argument, NULL, 'W'},
+ {"error", a_argument, NULL, 'E'},
++ {"symbols", a_argument, NULL, '@'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
+ {NULL, no_argument, NULL, 0x0},
+@@ -82,9 +86,9 @@
+ "\t\tdts - device tree source text\n"
+ "\t\tdtb - device tree blob\n"
+ "\t\tasm - assembler source",
+- "\n\tBlob version to produce, defaults to %d (for dtb and asm output)", //, DEFAULT_FDT_VERSION);
++ "\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
+ "\n\tOutput dependency file",
+- "\n\ttMake space for <number> reserve map entries (for dtb and asm output)",
++ "\n\tMake space for <number> reserve map entries (for dtb and asm output)",
+ "\n\tMake the blob at least <bytes> long (extra space)",
+ "\n\tAdd padding to the blob of <bytes> long (extra space)",
+ "\n\tSet the physical boot cpu",
+@@ -97,6 +101,7 @@
+ "\t\tboth - Both \"linux,phandle\" and \"phandle\" properties",
+ "\n\tEnable/disable warnings (prefix with \"no-\")",
+ "\n\tEnable/disable errors (prefix with \"no-\")",
++ "\n\tSymbols and Fixups support",
+ "\n\tPrint this help and exit",
+ "\n\tPrint version and exit",
+ NULL,
+@@ -109,7 +114,7 @@
+ const char *outform = "dts";
+ const char *outname = "-";
+ const char *depname = NULL;
+- int force = 0, sort = 0;
++ bool force = false, sort = false;
+ const char *arg;
+ int opt;
+ FILE *outf = NULL;
+@@ -148,7 +153,7 @@
+ padsize = strtol(optarg, NULL, 0);
+ break;
+ case 'f':
+- force = 1;
++ force = true;
+ break;
+ case 'q':
+ quiet++;
+@@ -174,7 +179,7 @@
+ break;
+
+ case 's':
+- sort = 1;
++ sort = true;
+ break;
+
+ case 'W':
+@@ -184,7 +189,9 @@
+ case 'E':
+ parse_checks_option(false, true, optarg);
+ break;
+-
++ case '@':
++ symbol_fixup_support = 1;
++ break;
+ case 'h':
+ usage(NULL);
+ default:
+@@ -237,7 +244,7 @@
+ if (streq(outname, "-")) {
+ outf = stdout;
+ } else {
+- outf = fopen(outname, "w");
++ outf = fopen(outname, "wb");
+ if (! outf)
+ die("Couldn't open output file %s: %s\n",
+ outname, strerror(errno));
+diff -Nur linux-3.18.5/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h
+--- linux-3.18.5/scripts/dtc/dtc.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc.h 2015-02-02 09:28:05.514056445 +0100
+@@ -38,9 +38,9 @@
+ #include "util.h"
+
+ #ifdef DEBUG
+-#define debug(fmt,args...) printf(fmt, ##args)
++#define debug(...) printf(__VA_ARGS__)
+ #else
+-#define debug(fmt,args...)
++#define debug(...)
+ #endif
+
+
+@@ -54,6 +54,7 @@
+ extern int minsize; /* Minimum blob size */
+ extern int padsize; /* Additional padding to blob */
+ extern int phandle_format; /* Use linux,phandle or phandle properties */
++extern int symbol_fixup_support;/* enable symbols & fixup support */
+
+ #define PHANDLE_LEGACY 0x1
+ #define PHANDLE_EPAPR 0x2
+@@ -88,7 +89,7 @@
+ };
+
+
+-#define empty_data ((struct data){ /* all .members = 0 or NULL */ })
++#define empty_data ((struct data){ 0 /* all .members = 0 or NULL */ })
+
+ #define for_each_marker(m) \
+ for (; (m); (m) = (m)->next)
+@@ -118,7 +119,7 @@
+
+ struct data data_add_marker(struct data d, enum markertype type, char *ref);
+
+-int data_is_one_string(struct data d);
++bool data_is_one_string(struct data d);
+
+ /* DT constraints */
+
+@@ -127,13 +128,32 @@
+
+ /* Live trees */
+ struct label {
+- int deleted;
++ bool deleted;
+ char *label;
+ struct label *next;
+ };
+
++struct fixup_entry {
++ int offset;
++ struct node *node;
++ struct property *prop;
++ struct fixup_entry *next;
++};
++
++struct fixup {
++ char *ref;
++ struct fixup_entry *entries;
++ struct fixup *next;
++};
++
++struct symbol {
++ struct label *label;
++ struct node *node;
++ struct symbol *next;
++};
++
+ struct property {
+- int deleted;
++ bool deleted;
+ char *name;
+ struct data val;
+
+@@ -143,7 +163,7 @@
+ };
+
+ struct node {
+- int deleted;
++ bool deleted;
+ char *name;
+ struct property *proplist;
+ struct node *children;
+@@ -158,6 +178,12 @@
+ int addr_cells, size_cells;
+
+ struct label *labels;
++
++ int is_root;
++ int is_plugin;
++ struct fixup *fixups;
++ struct symbol *symbols;
++ struct fixup_entry *local_fixups;
+ };
+
+ #define for_each_label_withdel(l0, l) \
+@@ -181,6 +207,18 @@
+ for_each_child_withdel(n, c) \
+ if (!(c)->deleted)
+
++#define for_each_fixup(n, f) \
++ for ((f) = (n)->fixups; (f); (f) = (f)->next)
++
++#define for_each_fixup_entry(f, fe) \
++ for ((fe) = (f)->entries; (fe); (fe) = (fe)->next)
++
++#define for_each_symbol(n, s) \
++ for ((s) = (n)->symbols; (s); (s) = (s)->next)
++
++#define for_each_local_fixup_entry(n, fe) \
++ for ((fe) = (n)->local_fixups; (fe); (fe) = (fe)->next)
++
+ void add_label(struct label **labels, char *label);
+ void delete_labels(struct label **labels);
+
+@@ -247,8 +285,8 @@
+
+ /* Checks */
+
+-void parse_checks_option(bool warn, bool error, const char *optarg);
+-void process_checks(int force, struct boot_info *bi);
++void parse_checks_option(bool warn, bool error, const char *arg);
++void process_checks(bool force, struct boot_info *bi);
+
+ /* Flattened trees */
+
+diff -Nur linux-3.18.5/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l
+--- linux-3.18.5/scripts/dtc/dtc-lexer.l 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc-lexer.l 2015-02-02 09:28:05.510056445 +0100
+@@ -20,7 +20,6 @@
+
+ %option noyywrap nounput noinput never-interactive
+
+-%x INCLUDE
+ %x BYTESTRING
+ %x PROPNODENAME
+ %s V1
+@@ -40,6 +39,7 @@
+ #include "dtc-parser.tab.h"
+
+ YYLTYPE yylloc;
++extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+ #define YY_USER_ACTION \
+@@ -61,7 +61,8 @@
+ BEGIN(V1); \
+
+ static void push_input_file(const char *filename);
+-static int pop_input_file(void);
++static bool pop_input_file(void);
++static void lexical_error(const char *fmt, ...);
+ %}
+
+ %%
+@@ -75,11 +76,11 @@
+ char *line, *tmp, *fn;
+ /* skip text before line # */
+ line = yytext;
+- while (!isdigit(*line))
++ while (!isdigit((unsigned char)*line))
+ line++;
+ /* skip digits in line # */
+ tmp = line;
+- while (!isspace(*tmp))
++ while (!isspace((unsigned char)*tmp))
+ tmp++;
+ /* "NULL"-terminate line # */
+ *tmp = '\0';
+@@ -112,6 +113,11 @@
+ return DT_V1;
+ }
+
++<*>"/plugin/" {
++ DPRINT("Keyword: /plugin/\n");
++ return DT_PLUGIN;
++ }
++
+ <*>"/memreserve/" {
+ DPRINT("Keyword: /memreserve/\n");
+ BEGIN_DEFAULT();
+@@ -146,15 +152,42 @@
+ }
+
+ <V1>([0-9]+|0[xX][0-9a-fA-F]+)(U|L|UL|LL|ULL)? {
+- yylval.literal = xstrdup(yytext);
+- DPRINT("Literal: '%s'\n", yylval.literal);
++ char *e;
++ DPRINT("Integer Literal: '%s'\n", yytext);
++
++ errno = 0;
++ yylval.integer = strtoull(yytext, &e, 0);
++
++ assert(!(*e) || !e[strspn(e, "UL")]);
++
++ if (errno == ERANGE)
++ lexical_error("Integer literal '%s' out of range",
++ yytext);
++ else
++ /* ERANGE is the only strtoull error triggerable
++ * by strings matching the pattern */
++ assert(errno == 0);
+ return DT_LITERAL;
+ }
+
+ <*>{CHAR_LITERAL} {
+- yytext[yyleng-1] = '\0';
+- yylval.literal = xstrdup(yytext+1);
+- DPRINT("Character literal: %s\n", yylval.literal);
++ struct data d;
++ DPRINT("Character literal: %s\n", yytext);
++
++ d = data_copy_escape_string(yytext+1, yyleng-2);
++ if (d.len == 1) {
++ lexical_error("Empty character literal");
++ yylval.integer = 0;
++ return DT_CHAR_LITERAL;
++ }
++
++ yylval.integer = (unsigned char)d.val[0];
++
++ if (d.len > 2)
++ lexical_error("Character literal has %d"
++ " characters instead of 1",
++ d.len - 1);
++
+ return DT_CHAR_LITERAL;
+ }
+
+@@ -164,7 +197,7 @@
+ return DT_REF;
+ }
+
+-<*>"&{/"{PATHCHAR}+\} { /* new-style path reference */
++<*>"&{/"{PATHCHAR}*\} { /* new-style path reference */
+ yytext[yyleng-1] = '\0';
+ DPRINT("Ref: %s\n", yytext+2);
+ yylval.labelref = xstrdup(yytext+2);
+@@ -238,13 +271,24 @@
+ }
+
+
+-static int pop_input_file(void)
++static bool pop_input_file(void)
+ {
+ if (srcfile_pop() == 0)
+- return 0;
++ return false;
+
+ yypop_buffer_state();
+ yyin = current_srcfile->f;
+
+- return 1;
++ return true;
++}
++
++static void lexical_error(const char *fmt, ...)
++{
++ va_list ap;
++
++ va_start(ap, fmt);
++ srcpos_verror(&yylloc, "Lexical error", fmt, ap);
++ va_end(ap);
++
++ treesource_error = true;
+ }
+diff -Nur linux-3.18.5/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped
+--- linux-3.18.5/scripts/dtc/dtc-lexer.lex.c_shipped 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped 2015-02-02 09:28:05.510056445 +0100
+@@ -372,8 +372,8 @@
+ *yy_cp = '\0'; \
+ (yy_c_buf_p) = yy_cp;
+
+-#define YY_NUM_RULES 30
+-#define YY_END_OF_BUFFER 31
++#define YY_NUM_RULES 31
++#define YY_END_OF_BUFFER 32
+ /* This struct is not used in this scanner,
+ but its presence is necessary. */
+ struct yy_trans_info
+@@ -381,25 +381,26 @@
+ flex_int32_t yy_verify;
+ flex_int32_t yy_nxt;
+ };
+-static yyconst flex_int16_t yy_accept[161] =
++static yyconst flex_int16_t yy_accept[166] =
+ { 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 32, 30,
++ 19, 19, 30, 30, 30, 30, 30, 30, 30, 30,
++ 30, 30, 30, 30, 30, 30, 16, 17, 17, 30,
++ 17, 11, 11, 19, 27, 0, 3, 0, 28, 13,
++ 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
++ 0, 22, 24, 26, 25, 23, 0, 10, 29, 0,
++ 0, 0, 15, 15, 17, 17, 17, 11, 11, 11,
++ 0, 13, 0, 12, 0, 0, 0, 21, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 17, 11, 11,
++ 11, 0, 14, 20, 0, 0, 0, 0, 0, 0,
++
++ 0, 0, 0, 0, 17, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 17, 7, 0, 0, 0,
++ 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 4, 18, 0, 0, 5, 2,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 31, 29, 18, 18, 29, 29, 29, 29, 29, 29,
+- 29, 29, 29, 29, 29, 29, 29, 29, 15, 16,
+- 16, 29, 16, 10, 10, 18, 26, 0, 3, 0,
+- 27, 12, 0, 0, 11, 0, 0, 0, 0, 0,
+- 0, 0, 21, 23, 25, 24, 22, 0, 9, 28,
+- 0, 0, 0, 14, 14, 16, 16, 16, 10, 10,
+- 10, 0, 12, 0, 11, 0, 0, 0, 20, 0,
+- 0, 0, 0, 0, 0, 0, 0, 16, 10, 10,
+- 10, 0, 19, 0, 0, 0, 0, 0, 0, 0,
+-
+- 0, 0, 16, 13, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 16, 6, 0, 0, 0, 0, 0,
+- 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
+- 4, 17, 0, 0, 2, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+- 0, 0, 5, 8, 0, 0, 0, 0, 7, 0
++ 0, 0, 1, 0, 0, 0, 0, 6, 9, 0,
++ 0, 0, 0, 8, 0
+ } ;
+
+ static yyconst flex_int32_t yy_ec[256] =
+@@ -415,9 +416,9 @@
+ 22, 22, 22, 22, 24, 22, 22, 25, 22, 22,
+ 1, 26, 27, 1, 22, 1, 21, 28, 29, 30,
+
+- 31, 21, 22, 22, 32, 22, 22, 33, 34, 35,
+- 36, 37, 22, 38, 39, 40, 41, 42, 22, 25,
+- 43, 22, 44, 45, 46, 1, 1, 1, 1, 1,
++ 31, 21, 32, 22, 33, 22, 22, 34, 35, 36,
++ 37, 38, 22, 39, 40, 41, 42, 43, 22, 25,
++ 44, 22, 45, 46, 47, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+@@ -434,163 +435,165 @@
+ 1, 1, 1, 1, 1
+ } ;
+
+-static yyconst flex_int32_t yy_meta[47] =
++static yyconst flex_int32_t yy_meta[48] =
+ { 0,
+ 1, 1, 1, 1, 1, 1, 2, 3, 1, 2,
+ 2, 2, 4, 5, 5, 5, 6, 1, 1, 1,
+ 7, 8, 8, 8, 8, 1, 1, 7, 7, 7,
+ 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+- 8, 8, 8, 3, 1, 1
++ 8, 8, 8, 8, 3, 1, 4
+ } ;
+
+-static yyconst flex_int16_t yy_base[175] =
++static yyconst flex_int16_t yy_base[180] =
+ { 0,
+- 0, 385, 378, 40, 41, 383, 72, 382, 34, 44,
+- 388, 393, 61, 117, 368, 116, 115, 115, 115, 48,
+- 367, 107, 368, 339, 127, 120, 0, 147, 393, 0,
+- 127, 0, 133, 156, 168, 153, 393, 125, 393, 380,
+- 393, 0, 369, 127, 393, 160, 371, 377, 347, 21,
+- 343, 346, 393, 393, 393, 393, 393, 359, 393, 393,
+- 183, 343, 339, 393, 356, 0, 183, 340, 187, 348,
+- 347, 0, 0, 0, 178, 359, 195, 365, 354, 326,
+- 332, 325, 334, 328, 204, 326, 331, 324, 393, 335,
+- 150, 311, 343, 342, 315, 322, 340, 179, 313, 207,
+-
+- 319, 316, 317, 393, 337, 333, 305, 302, 311, 301,
+- 310, 190, 338, 337, 393, 307, 322, 301, 305, 277,
+- 208, 311, 307, 278, 271, 270, 248, 246, 213, 130,
+- 393, 393, 263, 235, 207, 221, 218, 229, 213, 213,
+- 206, 234, 218, 210, 208, 193, 219, 393, 223, 204,
+- 176, 157, 393, 393, 120, 106, 97, 119, 393, 393,
+- 245, 251, 259, 263, 267, 273, 280, 284, 292, 300,
+- 304, 310, 318, 326
++ 0, 393, 35, 392, 66, 391, 38, 107, 397, 401,
++ 55, 113, 377, 112, 111, 111, 114, 42, 376, 106,
++ 377, 347, 126, 120, 0, 147, 401, 0, 124, 0,
++ 137, 158, 170, 163, 401, 153, 401, 389, 401, 0,
++ 378, 120, 401, 131, 380, 386, 355, 139, 351, 355,
++ 351, 401, 401, 401, 401, 401, 367, 401, 401, 185,
++ 350, 346, 401, 364, 0, 185, 347, 189, 356, 355,
++ 0, 0, 330, 180, 366, 141, 372, 361, 332, 338,
++ 331, 341, 334, 326, 205, 331, 337, 329, 401, 341,
++ 167, 316, 401, 349, 348, 320, 328, 346, 180, 318,
++
++ 324, 209, 324, 320, 322, 342, 338, 309, 306, 315,
++ 305, 315, 312, 192, 342, 341, 401, 293, 306, 282,
++ 268, 252, 255, 203, 285, 282, 272, 268, 252, 233,
++ 232, 239, 208, 107, 401, 401, 238, 211, 401, 211,
++ 212, 208, 228, 203, 215, 207, 233, 222, 212, 211,
++ 203, 227, 401, 237, 225, 204, 185, 401, 401, 149,
++ 128, 88, 42, 401, 401, 253, 259, 267, 271, 275,
++ 281, 288, 292, 300, 308, 312, 318, 326, 334
+ } ;
+
+-static yyconst flex_int16_t yy_def[175] =
++static yyconst flex_int16_t yy_def[180] =
+ { 0,
+- 160, 1, 1, 1, 1, 5, 160, 7, 1, 1,
+- 160, 160, 160, 160, 160, 161, 162, 163, 160, 160,
+- 160, 160, 164, 160, 160, 160, 165, 164, 160, 166,
+- 167, 166, 166, 160, 160, 160, 160, 161, 160, 161,
+- 160, 168, 160, 163, 160, 163, 169, 170, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 164, 160, 160,
+- 160, 160, 160, 160, 164, 166, 167, 166, 160, 160,
+- 160, 171, 168, 172, 163, 169, 169, 170, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 166, 160, 160,
+- 171, 172, 160, 160, 160, 160, 160, 160, 160, 160,
+-
+- 160, 160, 166, 160, 160, 160, 160, 160, 160, 160,
+- 160, 173, 160, 166, 160, 160, 160, 160, 160, 160,
+- 173, 160, 173, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 174, 160, 160, 160, 174, 160, 174, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 0,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160
++ 165, 1, 1, 3, 165, 5, 1, 1, 165, 165,
++ 165, 165, 165, 166, 167, 168, 165, 165, 165, 165,
++ 169, 165, 165, 165, 170, 169, 165, 171, 172, 171,
++ 171, 165, 165, 165, 165, 166, 165, 166, 165, 173,
++ 165, 168, 165, 168, 174, 175, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 169, 165, 165, 165,
++ 165, 165, 165, 169, 171, 172, 171, 165, 165, 165,
++ 176, 173, 177, 168, 174, 174, 175, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 171, 165, 165,
++ 176, 177, 165, 165, 165, 165, 165, 165, 165, 165,
++
++ 165, 165, 165, 165, 171, 165, 165, 165, 165, 165,
++ 165, 165, 165, 178, 165, 171, 165, 165, 165, 165,
++ 165, 165, 165, 178, 165, 178, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 179, 165, 165,
++ 165, 179, 165, 179, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 0, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165
+ } ;
+
+-static yyconst flex_int16_t yy_nxt[440] =
++static yyconst flex_int16_t yy_nxt[449] =
+ { 0,
+- 12, 13, 14, 13, 15, 16, 12, 17, 18, 12,
+- 12, 12, 19, 12, 12, 12, 12, 20, 21, 22,
+- 23, 23, 23, 23, 23, 12, 12, 23, 23, 23,
+- 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+- 23, 23, 23, 12, 24, 12, 25, 34, 35, 35,
+- 25, 81, 26, 26, 27, 27, 27, 34, 35, 35,
+- 82, 28, 36, 36, 36, 53, 54, 29, 28, 28,
+- 28, 28, 12, 13, 14, 13, 15, 16, 30, 17,
+- 18, 30, 30, 30, 26, 30, 30, 30, 12, 20,
+- 21, 22, 31, 31, 31, 31, 31, 32, 12, 31,
+-
+- 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+- 31, 31, 31, 31, 31, 12, 24, 12, 36, 36,
+- 36, 39, 41, 45, 47, 56, 57, 48, 61, 47,
+- 39, 159, 48, 66, 61, 45, 66, 66, 66, 158,
+- 46, 40, 49, 59, 50, 157, 51, 49, 52, 50,
+- 40, 63, 46, 52, 36, 36, 36, 156, 43, 62,
+- 65, 65, 65, 59, 136, 68, 137, 65, 75, 69,
+- 69, 69, 70, 71, 65, 65, 65, 65, 70, 71,
+- 72, 69, 69, 69, 61, 46, 45, 155, 154, 66,
+- 70, 71, 66, 66, 66, 122, 85, 85, 85, 59,
+-
+- 69, 69, 69, 46, 77, 100, 109, 93, 100, 70,
+- 71, 110, 112, 122, 129, 123, 153, 85, 85, 85,
+- 135, 135, 135, 148, 148, 160, 135, 135, 135, 152,
+- 142, 142, 142, 123, 143, 142, 142, 142, 151, 143,
+- 150, 146, 145, 149, 149, 38, 38, 38, 38, 38,
+- 38, 38, 38, 42, 144, 141, 140, 42, 42, 44,
+- 44, 44, 44, 44, 44, 44, 44, 58, 58, 58,
+- 58, 64, 139, 64, 66, 138, 134, 66, 133, 66,
+- 66, 67, 132, 131, 67, 67, 67, 67, 73, 130,
+- 73, 73, 76, 76, 76, 76, 76, 76, 76, 76,
+-
+- 78, 78, 78, 78, 78, 78, 78, 78, 91, 160,
+- 91, 92, 129, 92, 92, 128, 92, 92, 121, 121,
+- 121, 121, 121, 121, 121, 121, 147, 147, 147, 147,
+- 147, 147, 147, 147, 127, 126, 125, 124, 61, 61,
+- 120, 119, 118, 117, 116, 115, 47, 114, 110, 113,
+- 111, 108, 107, 106, 48, 105, 104, 89, 103, 102,
+- 101, 99, 98, 97, 96, 95, 94, 79, 77, 90,
+- 89, 88, 59, 87, 86, 59, 84, 83, 80, 79,
+- 77, 74, 160, 60, 59, 55, 37, 160, 33, 25,
+- 26, 25, 11, 160, 160, 160, 160, 160, 160, 160,
+-
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160
++ 10, 11, 12, 11, 13, 14, 10, 15, 16, 10,
++ 10, 10, 17, 10, 10, 10, 10, 18, 19, 20,
++ 21, 21, 21, 21, 21, 10, 10, 21, 21, 21,
++ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
++ 21, 21, 21, 21, 10, 22, 10, 24, 25, 25,
++ 25, 32, 33, 33, 164, 26, 34, 34, 34, 52,
++ 53, 27, 26, 26, 26, 26, 10, 11, 12, 11,
++ 13, 14, 28, 15, 16, 28, 28, 28, 24, 28,
++ 28, 28, 10, 18, 19, 20, 29, 29, 29, 29,
++ 29, 30, 10, 29, 29, 29, 29, 29, 29, 29,
++
++ 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
++ 10, 22, 10, 23, 34, 34, 34, 37, 39, 43,
++ 32, 33, 33, 45, 55, 56, 46, 60, 43, 45,
++ 65, 163, 46, 65, 65, 65, 44, 38, 60, 74,
++ 58, 47, 141, 48, 142, 44, 49, 47, 50, 48,
++ 76, 51, 62, 94, 50, 41, 44, 51, 37, 61,
++ 64, 64, 64, 58, 34, 34, 34, 64, 162, 80,
++ 67, 68, 68, 68, 64, 64, 64, 64, 38, 81,
++ 69, 70, 71, 68, 68, 68, 60, 161, 43, 69,
++ 70, 65, 69, 70, 65, 65, 65, 125, 85, 85,
++
++ 85, 58, 68, 68, 68, 44, 102, 110, 125, 133,
++ 102, 69, 70, 111, 114, 160, 159, 126, 85, 85,
++ 85, 140, 140, 140, 140, 140, 140, 153, 126, 147,
++ 147, 147, 153, 148, 147, 147, 147, 158, 148, 165,
++ 157, 156, 155, 151, 150, 149, 146, 154, 145, 144,
++ 143, 139, 154, 36, 36, 36, 36, 36, 36, 36,
++ 36, 40, 138, 137, 136, 40, 40, 42, 42, 42,
++ 42, 42, 42, 42, 42, 57, 57, 57, 57, 63,
++ 135, 63, 65, 134, 165, 65, 133, 65, 65, 66,
++ 132, 131, 66, 66, 66, 66, 72, 130, 72, 72,
++
++ 75, 75, 75, 75, 75, 75, 75, 75, 77, 77,
++ 77, 77, 77, 77, 77, 77, 91, 129, 91, 92,
++ 128, 92, 92, 127, 92, 92, 124, 124, 124, 124,
++ 124, 124, 124, 124, 152, 152, 152, 152, 152, 152,
++ 152, 152, 60, 60, 123, 122, 121, 120, 119, 118,
++ 117, 45, 116, 111, 115, 113, 112, 109, 108, 107,
++ 46, 106, 93, 89, 105, 104, 103, 101, 100, 99,
++ 98, 97, 96, 95, 78, 76, 93, 90, 89, 88,
++ 58, 87, 86, 58, 84, 83, 82, 79, 78, 76,
++ 73, 165, 59, 58, 54, 35, 165, 31, 23, 23,
++
++ 9, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165
+ } ;
+
+-static yyconst flex_int16_t yy_chk[440] =
++static yyconst flex_int16_t yy_chk[449] =
+ { 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+- 1, 1, 1, 1, 1, 1, 4, 9, 9, 9,
+- 10, 50, 4, 5, 5, 5, 5, 10, 10, 10,
+- 50, 5, 13, 13, 13, 20, 20, 5, 5, 5,
+- 5, 5, 7, 7, 7, 7, 7, 7, 7, 7,
+- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+-
+- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+- 7, 7, 7, 7, 7, 7, 7, 7, 14, 14,
+- 14, 16, 17, 18, 19, 22, 22, 19, 25, 26,
+- 38, 158, 26, 31, 33, 44, 31, 31, 31, 157,
+- 18, 16, 19, 31, 19, 156, 19, 26, 19, 26,
+- 38, 26, 44, 26, 36, 36, 36, 155, 17, 25,
+- 28, 28, 28, 28, 130, 33, 130, 28, 46, 34,
+- 34, 34, 91, 91, 28, 28, 28, 28, 34, 34,
+- 34, 35, 35, 35, 61, 46, 75, 152, 151, 67,
+- 35, 35, 67, 67, 67, 112, 61, 61, 61, 67,
+-
+- 69, 69, 69, 75, 77, 85, 98, 77, 100, 69,
+- 69, 98, 100, 121, 129, 112, 150, 85, 85, 85,
+- 135, 135, 135, 143, 147, 149, 129, 129, 129, 146,
+- 138, 138, 138, 121, 138, 142, 142, 142, 145, 142,
+- 144, 141, 140, 143, 147, 161, 161, 161, 161, 161,
+- 161, 161, 161, 162, 139, 137, 136, 162, 162, 163,
+- 163, 163, 163, 163, 163, 163, 163, 164, 164, 164,
+- 164, 165, 134, 165, 166, 133, 128, 166, 127, 166,
+- 166, 167, 126, 125, 167, 167, 167, 167, 168, 124,
+- 168, 168, 169, 169, 169, 169, 169, 169, 169, 169,
+-
+- 170, 170, 170, 170, 170, 170, 170, 170, 171, 123,
+- 171, 172, 122, 172, 172, 120, 172, 172, 173, 173,
+- 173, 173, 173, 173, 173, 173, 174, 174, 174, 174,
+- 174, 174, 174, 174, 119, 118, 117, 116, 114, 113,
+- 111, 110, 109, 108, 107, 106, 105, 103, 102, 101,
+- 99, 97, 96, 95, 94, 93, 92, 90, 88, 87,
+- 86, 84, 83, 82, 81, 80, 79, 78, 76, 71,
+- 70, 68, 65, 63, 62, 58, 52, 51, 49, 48,
+- 47, 43, 40, 24, 23, 21, 15, 11, 8, 6,
+- 3, 2, 160, 160, 160, 160, 160, 160, 160, 160,
+-
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+- 160, 160, 160, 160, 160, 160, 160, 160, 160
++ 1, 1, 1, 1, 1, 1, 1, 3, 3, 3,
++ 3, 7, 7, 7, 163, 3, 11, 11, 11, 18,
++ 18, 3, 3, 3, 3, 3, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++
++ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
++ 5, 5, 5, 8, 12, 12, 12, 14, 15, 16,
++ 8, 8, 8, 17, 20, 20, 17, 23, 42, 24,
++ 29, 162, 24, 29, 29, 29, 16, 14, 31, 44,
++ 29, 17, 134, 17, 134, 42, 17, 24, 17, 24,
++ 76, 17, 24, 76, 24, 15, 44, 24, 36, 23,
++ 26, 26, 26, 26, 34, 34, 34, 26, 161, 48,
++ 31, 32, 32, 32, 26, 26, 26, 26, 36, 48,
++ 32, 32, 32, 33, 33, 33, 60, 160, 74, 91,
++ 91, 66, 33, 33, 66, 66, 66, 114, 60, 60,
++
++ 60, 66, 68, 68, 68, 74, 85, 99, 124, 133,
++ 102, 68, 68, 99, 102, 157, 156, 114, 85, 85,
++ 85, 133, 133, 133, 140, 140, 140, 148, 124, 143,
++ 143, 143, 152, 143, 147, 147, 147, 155, 147, 154,
++ 151, 150, 149, 146, 145, 144, 142, 148, 141, 138,
++ 137, 132, 152, 166, 166, 166, 166, 166, 166, 166,
++ 166, 167, 131, 130, 129, 167, 167, 168, 168, 168,
++ 168, 168, 168, 168, 168, 169, 169, 169, 169, 170,
++ 128, 170, 171, 127, 126, 171, 125, 171, 171, 172,
++ 123, 122, 172, 172, 172, 172, 173, 121, 173, 173,
++
++ 174, 174, 174, 174, 174, 174, 174, 174, 175, 175,
++ 175, 175, 175, 175, 175, 175, 176, 120, 176, 177,
++ 119, 177, 177, 118, 177, 177, 178, 178, 178, 178,
++ 178, 178, 178, 178, 179, 179, 179, 179, 179, 179,
++ 179, 179, 116, 115, 113, 112, 111, 110, 109, 108,
++ 107, 106, 105, 104, 103, 101, 100, 98, 97, 96,
++ 95, 94, 92, 90, 88, 87, 86, 84, 83, 82,
++ 81, 80, 79, 78, 77, 75, 73, 70, 69, 67,
++ 64, 62, 61, 57, 51, 50, 49, 47, 46, 45,
++ 41, 38, 22, 21, 19, 13, 9, 6, 4, 2,
++
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165, 165, 165,
++ 165, 165, 165, 165, 165, 165, 165, 165
+ } ;
+
+ static yy_state_type yy_last_accepting_state;
+@@ -631,13 +634,13 @@
+
+
+
+-
+-#line 38 "dtc-lexer.l"
++#line 37 "dtc-lexer.l"
+ #include "dtc.h"
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+ YYLTYPE yylloc;
++extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+ #define YY_USER_ACTION \
+@@ -659,14 +662,14 @@
+ BEGIN(V1); \
+
+ static void push_input_file(const char *filename);
+-static int pop_input_file(void);
+-#line 664 "dtc-lexer.lex.c"
++static bool pop_input_file(void);
++static void lexical_error(const char *fmt, ...);
++#line 668 "dtc-lexer.lex.c"
+
+ #define INITIAL 0
+-#define INCLUDE 1
+-#define BYTESTRING 2
+-#define PROPNODENAME 3
+-#define V1 4
++#define BYTESTRING 1
++#define PROPNODENAME 2
++#define V1 3
+
+ #ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+@@ -852,9 +855,9 @@
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
+
+-#line 67 "dtc-lexer.l"
++#line 68 "dtc-lexer.l"
+
+-#line 858 "dtc-lexer.lex.c"
++#line 861 "dtc-lexer.lex.c"
+
+ if ( !(yy_init) )
+ {
+@@ -908,13 +911,13 @@
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+- if ( yy_current_state >= 161 )
++ if ( yy_current_state >= 166 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ ++yy_cp;
+ }
+- while ( yy_current_state != 160 );
++ while ( yy_current_state != 165 );
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+
+@@ -937,7 +940,7 @@
+ case 1:
+ /* rule 1 can match eol */
+ YY_RULE_SETUP
+-#line 68 "dtc-lexer.l"
++#line 69 "dtc-lexer.l"
+ {
+ char *name = strchr(yytext, '\"') + 1;
+ yytext[yyleng-1] = '\0';
+@@ -947,16 +950,16 @@
+ case 2:
+ /* rule 2 can match eol */
+ YY_RULE_SETUP
+-#line 74 "dtc-lexer.l"
++#line 75 "dtc-lexer.l"
+ {
+ char *line, *tmp, *fn;
+ /* skip text before line # */
+ line = yytext;
+- while (!isdigit(*line))
++ while (!isdigit((unsigned char)*line))
+ line++;
+ /* skip digits in line # */
+ tmp = line;
+- while (!isspace(*tmp))
++ while (!isspace((unsigned char)*tmp))
+ tmp++;
+ /* "NULL"-terminate line # */
+ *tmp = '\0';
+@@ -970,11 +973,10 @@
+ }
+ YY_BREAK
+ case YY_STATE_EOF(INITIAL):
+-case YY_STATE_EOF(INCLUDE):
+ case YY_STATE_EOF(BYTESTRING):
+ case YY_STATE_EOF(PROPNODENAME):
+ case YY_STATE_EOF(V1):
+-#line 95 "dtc-lexer.l"
++#line 96 "dtc-lexer.l"
+ {
+ if (!pop_input_file()) {
+ yyterminate();
+@@ -984,7 +986,7 @@
+ case 3:
+ /* rule 3 can match eol */
+ YY_RULE_SETUP
+-#line 101 "dtc-lexer.l"
++#line 102 "dtc-lexer.l"
+ {
+ DPRINT("String: %s\n", yytext);
+ yylval.data = data_copy_escape_string(yytext+1,
+@@ -994,7 +996,7 @@
+ YY_BREAK
+ case 4:
+ YY_RULE_SETUP
+-#line 108 "dtc-lexer.l"
++#line 109 "dtc-lexer.l"
+ {
+ DPRINT("Keyword: /dts-v1/\n");
+ dts_version = 1;
+@@ -1004,25 +1006,33 @@
+ YY_BREAK
+ case 5:
+ YY_RULE_SETUP
+-#line 115 "dtc-lexer.l"
++#line 116 "dtc-lexer.l"
++{
++ DPRINT("Keyword: /plugin/\n");
++ return DT_PLUGIN;
++ }
++ YY_BREAK
++case 6:
++YY_RULE_SETUP
++#line 121 "dtc-lexer.l"
+ {
+ DPRINT("Keyword: /memreserve/\n");
+ BEGIN_DEFAULT();
+ return DT_MEMRESERVE;
+ }
+ YY_BREAK
+-case 6:
++case 7:
+ YY_RULE_SETUP
+-#line 121 "dtc-lexer.l"
++#line 127 "dtc-lexer.l"
+ {
+ DPRINT("Keyword: /bits/\n");
+ BEGIN_DEFAULT();
+ return DT_BITS;
+ }
+ YY_BREAK
+-case 7:
++case 8:
+ YY_RULE_SETUP
+-#line 127 "dtc-lexer.l"
++#line 133 "dtc-lexer.l"
+ {
+ DPRINT("Keyword: /delete-property/\n");
+ DPRINT("<PROPNODENAME>\n");
+@@ -1030,9 +1040,9 @@
+ return DT_DEL_PROP;
+ }
+ YY_BREAK
+-case 8:
++case 9:
+ YY_RULE_SETUP
+-#line 134 "dtc-lexer.l"
++#line 140 "dtc-lexer.l"
+ {
+ DPRINT("Keyword: /delete-node/\n");
+ DPRINT("<PROPNODENAME>\n");
+@@ -1040,9 +1050,9 @@
+ return DT_DEL_NODE;
+ }
+ YY_BREAK
+-case 9:
++case 10:
+ YY_RULE_SETUP
+-#line 141 "dtc-lexer.l"
++#line 147 "dtc-lexer.l"
+ {
+ DPRINT("Label: %s\n", yytext);
+ yylval.labelref = xstrdup(yytext);
+@@ -1050,38 +1060,65 @@
+ return DT_LABEL;
+ }
+ YY_BREAK
+-case 10:
++case 11:
+ YY_RULE_SETUP
+-#line 148 "dtc-lexer.l"
++#line 154 "dtc-lexer.l"
+ {
+- yylval.literal = xstrdup(yytext);
+- DPRINT("Literal: '%s'\n", yylval.literal);
++ char *e;
++ DPRINT("Integer Literal: '%s'\n", yytext);
++
++ errno = 0;
++ yylval.integer = strtoull(yytext, &e, 0);
++
++ assert(!(*e) || !e[strspn(e, "UL")]);
++
++ if (errno == ERANGE)
++ lexical_error("Integer literal '%s' out of range",
++ yytext);
++ else
++ /* ERANGE is the only strtoull error triggerable
++ * by strings matching the pattern */
++ assert(errno == 0);
+ return DT_LITERAL;
+ }
+ YY_BREAK
+-case 11:
+-/* rule 11 can match eol */
++case 12:
++/* rule 12 can match eol */
+ YY_RULE_SETUP
+-#line 154 "dtc-lexer.l"
++#line 173 "dtc-lexer.l"
+ {
+- yytext[yyleng-1] = '\0';
+- yylval.literal = xstrdup(yytext+1);
+- DPRINT("Character literal: %s\n", yylval.literal);
++ struct data d;
++ DPRINT("Character literal: %s\n", yytext);
++
++ d = data_copy_escape_string(yytext+1, yyleng-2);
++ if (d.len == 1) {
++ lexical_error("Empty character literal");
++ yylval.integer = 0;
++ return DT_CHAR_LITERAL;
++ }
++
++ yylval.integer = (unsigned char)d.val[0];
++
++ if (d.len > 2)
++ lexical_error("Character literal has %d"
++ " characters instead of 1",
++ d.len - 1);
++
+ return DT_CHAR_LITERAL;
+ }
+ YY_BREAK
+-case 12:
++case 13:
+ YY_RULE_SETUP
+-#line 161 "dtc-lexer.l"
++#line 194 "dtc-lexer.l"
+ { /* label reference */
+ DPRINT("Ref: %s\n", yytext+1);
+ yylval.labelref = xstrdup(yytext+1);
+ return DT_REF;
+ }
+ YY_BREAK
+-case 13:
++case 14:
+ YY_RULE_SETUP
+-#line 167 "dtc-lexer.l"
++#line 200 "dtc-lexer.l"
+ { /* new-style path reference */
+ yytext[yyleng-1] = '\0';
+ DPRINT("Ref: %s\n", yytext+2);
+@@ -1089,27 +1126,27 @@
+ return DT_REF;
+ }
+ YY_BREAK
+-case 14:
++case 15:
+ YY_RULE_SETUP
+-#line 174 "dtc-lexer.l"
++#line 207 "dtc-lexer.l"
+ {
+ yylval.byte = strtol(yytext, NULL, 16);
+ DPRINT("Byte: %02x\n", (int)yylval.byte);
+ return DT_BYTE;
+ }
+ YY_BREAK
+-case 15:
++case 16:
+ YY_RULE_SETUP
+-#line 180 "dtc-lexer.l"
++#line 213 "dtc-lexer.l"
+ {
+ DPRINT("/BYTESTRING\n");
+ BEGIN_DEFAULT();
+ return ']';
+ }
+ YY_BREAK
+-case 16:
++case 17:
+ YY_RULE_SETUP
+-#line 186 "dtc-lexer.l"
++#line 219 "dtc-lexer.l"
+ {
+ DPRINT("PropNodeName: %s\n", yytext);
+ yylval.propnodename = xstrdup((yytext[0] == '\\') ?
+@@ -1118,75 +1155,75 @@
+ return DT_PROPNODENAME;
+ }
+ YY_BREAK
+-case 17:
++case 18:
+ YY_RULE_SETUP
+-#line 194 "dtc-lexer.l"
++#line 227 "dtc-lexer.l"
+ {
+ DPRINT("Binary Include\n");
+ return DT_INCBIN;
+ }
+ YY_BREAK
+-case 18:
+-/* rule 18 can match eol */
+-YY_RULE_SETUP
+-#line 199 "dtc-lexer.l"
+-/* eat whitespace */
+- YY_BREAK
+ case 19:
+ /* rule 19 can match eol */
+ YY_RULE_SETUP
+-#line 200 "dtc-lexer.l"
+-/* eat C-style comments */
++#line 232 "dtc-lexer.l"
++/* eat whitespace */
+ YY_BREAK
+ case 20:
+ /* rule 20 can match eol */
+ YY_RULE_SETUP
+-#line 201 "dtc-lexer.l"
+-/* eat C++-style comments */
++#line 233 "dtc-lexer.l"
++/* eat C-style comments */
+ YY_BREAK
+ case 21:
++/* rule 21 can match eol */
+ YY_RULE_SETUP
+-#line 203 "dtc-lexer.l"
+-{ return DT_LSHIFT; };
++#line 234 "dtc-lexer.l"
++/* eat C++-style comments */
+ YY_BREAK
+ case 22:
+ YY_RULE_SETUP
+-#line 204 "dtc-lexer.l"
+-{ return DT_RSHIFT; };
++#line 236 "dtc-lexer.l"
++{ return DT_LSHIFT; };
+ YY_BREAK
+ case 23:
+ YY_RULE_SETUP
+-#line 205 "dtc-lexer.l"
+-{ return DT_LE; };
++#line 237 "dtc-lexer.l"
++{ return DT_RSHIFT; };
+ YY_BREAK
+ case 24:
+ YY_RULE_SETUP
+-#line 206 "dtc-lexer.l"
+-{ return DT_GE; };
++#line 238 "dtc-lexer.l"
++{ return DT_LE; };
+ YY_BREAK
+ case 25:
+ YY_RULE_SETUP
+-#line 207 "dtc-lexer.l"
+-{ return DT_EQ; };
++#line 239 "dtc-lexer.l"
++{ return DT_GE; };
+ YY_BREAK
+ case 26:
+ YY_RULE_SETUP
+-#line 208 "dtc-lexer.l"
+-{ return DT_NE; };
++#line 240 "dtc-lexer.l"
++{ return DT_EQ; };
+ YY_BREAK
+ case 27:
+ YY_RULE_SETUP
+-#line 209 "dtc-lexer.l"
+-{ return DT_AND; };
++#line 241 "dtc-lexer.l"
++{ return DT_NE; };
+ YY_BREAK
+ case 28:
+ YY_RULE_SETUP
+-#line 210 "dtc-lexer.l"
+-{ return DT_OR; };
++#line 242 "dtc-lexer.l"
++{ return DT_AND; };
+ YY_BREAK
+ case 29:
+ YY_RULE_SETUP
+-#line 212 "dtc-lexer.l"
++#line 243 "dtc-lexer.l"
++{ return DT_OR; };
++ YY_BREAK
++case 30:
++YY_RULE_SETUP
++#line 245 "dtc-lexer.l"
+ {
+ DPRINT("Char: %c (\\x%02x)\n", yytext[0],
+ (unsigned)yytext[0]);
+@@ -1202,12 +1239,12 @@
+ return yytext[0];
+ }
+ YY_BREAK
+-case 30:
++case 31:
+ YY_RULE_SETUP
+-#line 227 "dtc-lexer.l"
++#line 260 "dtc-lexer.l"
+ ECHO;
+ YY_BREAK
+-#line 1211 "dtc-lexer.lex.c"
++#line 1248 "dtc-lexer.lex.c"
+
+ case YY_END_OF_BUFFER:
+ {
+@@ -1499,7 +1536,7 @@
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+- if ( yy_current_state >= 161 )
++ if ( yy_current_state >= 166 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+@@ -1527,11 +1564,11 @@
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+- if ( yy_current_state >= 161 )
++ if ( yy_current_state >= 166 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+- yy_is_jam = (yy_current_state == 160);
++ yy_is_jam = (yy_current_state == 165);
+
+ return yy_is_jam ? 0 : yy_current_state;
+ }
+@@ -2166,7 +2203,7 @@
+
+ #define YYTABLES_NAME "yytables"
+
+-#line 227 "dtc-lexer.l"
++#line 260 "dtc-lexer.l"
+
+
+
+@@ -2182,14 +2219,25 @@
+ }
+
+
+-static int pop_input_file(void)
++static bool pop_input_file(void)
+ {
+ if (srcfile_pop() == 0)
+- return 0;
++ return false;
+
+ yypop_buffer_state();
+ yyin = current_srcfile->f;
+
+- return 1;
++ return true;
++}
++
++static void lexical_error(const char *fmt, ...)
++{
++ va_list ap;
++
++ va_start(ap, fmt);
++ srcpos_verror(&yylloc, "Lexical error", fmt, ap);
++ va_end(ap);
++
++ treesource_error = true;
+ }
+
+diff -Nur linux-3.18.5/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped
+--- linux-3.18.5/scripts/dtc/dtc-parser.tab.c_shipped 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped 2015-02-02 09:28:05.514056445 +0100
+@@ -1,19 +1,19 @@
+-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
++/* A Bison parser, made by GNU Bison 3.0.2. */
+
+ /* Bison implementation for Yacc-like parsers in C
+-
+- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+-
++
++ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
++
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+-
++
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+-
++
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+@@ -26,7 +26,7 @@
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+-
++
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+@@ -44,7 +44,7 @@
+ #define YYBISON 1
+
+ /* Bison version. */
+-#define YYBISON_VERSION "2.7.12-4996"
++#define YYBISON_VERSION "3.0.2"
+
+ /* Skeleton name. */
+ #define YYSKELETON_NAME "yacc.c"
+@@ -62,34 +62,32 @@
+
+
+ /* Copy the first part of user declarations. */
+-/* Line 371 of yacc.c */
+-#line 21 "dtc-parser.y"
++#line 20 "dtc-parser.y" /* yacc.c:339 */
+
+ #include <stdio.h>
++#include <inttypes.h>
+
+ #include "dtc.h"
+ #include "srcpos.h"
+
+-YYLTYPE yylloc;
+-
+ extern int yylex(void);
+-extern void print_error(char const *fmt, ...);
+ extern void yyerror(char const *s);
++#define ERROR(loc, ...) \
++ do { \
++ srcpos_error((loc), "Error", __VA_ARGS__); \
++ treesource_error = true; \
++ } while (0)
+
+ extern struct boot_info *the_boot_info;
+-extern int treesource_error;
+-
+-static unsigned long long eval_literal(const char *s, int base, int bits);
+-static unsigned char eval_char_literal(const char *s);
++extern bool treesource_error;
+
+-/* Line 371 of yacc.c */
+-#line 87 "dtc-parser.tab.c"
++#line 85 "dtc-parser.tab.c" /* yacc.c:339 */
+
+-# ifndef YY_NULL
++# ifndef YY_NULLPTR
+ # if defined __cplusplus && 201103L <= __cplusplus
+-# define YY_NULL nullptr
++# define YY_NULLPTR nullptr
+ # else
+-# define YY_NULL 0
++# define YY_NULLPTR 0
+ # endif
+ # endif
+
+@@ -105,7 +103,7 @@
+ by #include "dtc-parser.tab.h". */
+ #ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED
+ # define YY_YY_DTC_PARSER_TAB_H_INCLUDED
+-/* Enabling traces. */
++/* Debug traces. */
+ #ifndef YYDEBUG
+ # define YYDEBUG 0
+ #endif
+@@ -113,48 +111,45 @@
+ extern int yydebug;
+ #endif
+
+-/* Tokens. */
++/* Token type. */
+ #ifndef YYTOKENTYPE
+ # define YYTOKENTYPE
+- /* Put the tokens into the symbol table, so that GDB and other debuggers
+- know about them. */
+- enum yytokentype {
+- DT_V1 = 258,
+- DT_MEMRESERVE = 259,
+- DT_LSHIFT = 260,
+- DT_RSHIFT = 261,
+- DT_LE = 262,
+- DT_GE = 263,
+- DT_EQ = 264,
+- DT_NE = 265,
+- DT_AND = 266,
+- DT_OR = 267,
+- DT_BITS = 268,
+- DT_DEL_PROP = 269,
+- DT_DEL_NODE = 270,
+- DT_PROPNODENAME = 271,
+- DT_LITERAL = 272,
+- DT_CHAR_LITERAL = 273,
+- DT_BASE = 274,
+- DT_BYTE = 275,
+- DT_STRING = 276,
+- DT_LABEL = 277,
+- DT_REF = 278,
+- DT_INCBIN = 279
+- };
++ enum yytokentype
++ {
++ DT_V1 = 258,
++ DT_PLUGIN = 259,
++ DT_MEMRESERVE = 260,
++ DT_LSHIFT = 261,
++ DT_RSHIFT = 262,
++ DT_LE = 263,
++ DT_GE = 264,
++ DT_EQ = 265,
++ DT_NE = 266,
++ DT_AND = 267,
++ DT_OR = 268,
++ DT_BITS = 269,
++ DT_DEL_PROP = 270,
++ DT_DEL_NODE = 271,
++ DT_PROPNODENAME = 272,
++ DT_LITERAL = 273,
++ DT_CHAR_LITERAL = 274,
++ DT_BYTE = 275,
++ DT_STRING = 276,
++ DT_LABEL = 277,
++ DT_REF = 278,
++ DT_INCBIN = 279
++ };
+ #endif
+
+-
++/* Value type. */
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+-typedef union YYSTYPE
++typedef union YYSTYPE YYSTYPE;
++union YYSTYPE
+ {
+-/* Line 387 of yacc.c */
+-#line 40 "dtc-parser.y"
++#line 39 "dtc-parser.y" /* yacc.c:355 */
+
+ char *propnodename;
+- char *literal;
+ char *labelref;
+- unsigned int cbase;
+ uint8_t byte;
+ struct data data;
+
+@@ -169,38 +164,38 @@
+ struct node *nodelist;
+ struct reserve_info *re;
+ uint64_t integer;
++ int is_plugin;
+
+-
+-/* Line 387 of yacc.c */
+-#line 176 "dtc-parser.tab.c"
+-} YYSTYPE;
++#line 170 "dtc-parser.tab.c" /* yacc.c:355 */
++};
+ # define YYSTYPE_IS_TRIVIAL 1
+-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+ # define YYSTYPE_IS_DECLARED 1
+ #endif
+
+-extern YYSTYPE yylval;
+-
+-#ifdef YYPARSE_PARAM
+-#if defined __STDC__ || defined __cplusplus
+-int yyparse (void *YYPARSE_PARAM);
+-#else
+-int yyparse ();
++/* Location type. */
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
++typedef struct YYLTYPE YYLTYPE;
++struct YYLTYPE
++{
++ int first_line;
++ int first_column;
++ int last_line;
++ int last_column;
++};
++# define YYLTYPE_IS_DECLARED 1
++# define YYLTYPE_IS_TRIVIAL 1
+ #endif
+-#else /* ! YYPARSE_PARAM */
+-#if defined __STDC__ || defined __cplusplus
++
++
++extern YYSTYPE yylval;
++extern YYLTYPE yylloc;
+ int yyparse (void);
+-#else
+-int yyparse ();
+-#endif
+-#endif /* ! YYPARSE_PARAM */
+
+ #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */
+
+ /* Copy the second part of user declarations. */
+
+-/* Line 390 of yacc.c */
+-#line 204 "dtc-parser.tab.c"
++#line 199 "dtc-parser.tab.c" /* yacc.c:358 */
+
+ #ifdef short
+ # undef short
+@@ -214,11 +209,8 @@
+
+ #ifdef YYTYPE_INT8
+ typedef YYTYPE_INT8 yytype_int8;
+-#elif (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-typedef signed char yytype_int8;
+ #else
+-typedef short int yytype_int8;
++typedef signed char yytype_int8;
+ #endif
+
+ #ifdef YYTYPE_UINT16
+@@ -238,8 +230,7 @@
+ # define YYSIZE_T __SIZE_TYPE__
+ # elif defined size_t
+ # define YYSIZE_T size_t
+-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
++# elif ! defined YYSIZE_T
+ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+ # define YYSIZE_T size_t
+ # else
+@@ -261,11 +252,30 @@
+ # endif
+ #endif
+
+-#ifndef __attribute__
+-/* This feature is available in gcc versions 2.5 and later. */
+-# if (! defined __GNUC__ || __GNUC__ < 2 \
+- || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+-# define __attribute__(Spec) /* empty */
++#ifndef YY_ATTRIBUTE
++# if (defined __GNUC__ \
++ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \
++ || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
++# define YY_ATTRIBUTE(Spec) __attribute__(Spec)
++# else
++# define YY_ATTRIBUTE(Spec) /* empty */
++# endif
++#endif
++
++#ifndef YY_ATTRIBUTE_PURE
++# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__))
++#endif
++
++#ifndef YY_ATTRIBUTE_UNUSED
++# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
++#endif
++
++#if !defined _Noreturn \
++ && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
++# if defined _MSC_VER && 1200 <= _MSC_VER
++# define _Noreturn __declspec (noreturn)
++# else
++# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+ # endif
+ #endif
+
+@@ -276,24 +286,25 @@
+ # define YYUSE(E) /* empty */
+ #endif
+
+-
+-/* Identity function, used to suppress warnings about constant conditions. */
+-#ifndef lint
+-# define YYID(N) (N)
+-#else
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-static int
+-YYID (int yyi)
++#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
++/* Suppress an incorrect diagnostic about yylval being uninitialized. */
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
++ _Pragma ("GCC diagnostic push") \
++ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
++ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
++ _Pragma ("GCC diagnostic pop")
+ #else
+-static int
+-YYID (yyi)
+- int yyi;
++# define YY_INITIAL_VALUE(Value) Value
+ #endif
+-{
+- return yyi;
+-}
++#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+ #endif
++#ifndef YY_INITIAL_VALUE
++# define YY_INITIAL_VALUE(Value) /* Nothing. */
++#endif
++
+
+ #if ! defined yyoverflow || YYERROR_VERBOSE
+
+@@ -312,8 +323,7 @@
+ # define alloca _alloca
+ # else
+ # define YYSTACK_ALLOC alloca
+-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
++# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
+ # ifndef EXIT_SUCCESS
+@@ -325,8 +335,8 @@
+ # endif
+
+ # ifdef YYSTACK_ALLOC
+- /* Pacify GCC's `empty if-body' warning. */
+-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
++ /* Pacify GCC's 'empty if-body' warning. */
++# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+ # ifndef YYSTACK_ALLOC_MAXIMUM
+ /* The OS might guarantee only one guard page at the bottom of the stack,
+ and a page size can be as small as 4096 bytes. So we cannot safely
+@@ -342,7 +352,7 @@
+ # endif
+ # if (defined __cplusplus && ! defined EXIT_SUCCESS \
+ && ! ((defined YYMALLOC || defined malloc) \
+- && (defined YYFREE || defined free)))
++ && (defined YYFREE || defined free)))
+ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ # ifndef EXIT_SUCCESS
+ # define EXIT_SUCCESS 0
+@@ -350,15 +360,13 @@
+ # endif
+ # ifndef YYMALLOC
+ # define YYMALLOC malloc
+-# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
++# if ! defined malloc && ! defined EXIT_SUCCESS
+ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+ # ifndef YYFREE
+ # define YYFREE free
+-# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
++# if ! defined free && ! defined EXIT_SUCCESS
+ void free (void *); /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+@@ -368,13 +376,15 @@
+
+ #if (! defined yyoverflow \
+ && (! defined __cplusplus \
+- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
++ || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
++ && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+ /* A type that is properly aligned for any stack member. */
+ union yyalloc
+ {
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
++ YYLTYPE yyls_alloc;
+ };
+
+ /* The size of the maximum gap between one aligned stack and the next. */
+@@ -383,8 +393,8 @@
+ /* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+ # define YYSTACK_BYTES(N) \
+- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+- + YYSTACK_GAP_MAXIMUM)
++ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
++ + 2 * YYSTACK_GAP_MAXIMUM)
+
+ # define YYCOPY_NEEDED 1
+
+@@ -393,16 +403,16 @@
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+- do \
+- { \
+- YYSIZE_T yynewbytes; \
+- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+- Stack = &yyptr->Stack_alloc; \
+- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+- yyptr += yynewbytes / sizeof (*yyptr); \
+- } \
+- while (YYID (0))
++# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
++ do \
++ { \
++ YYSIZE_T yynewbytes; \
++ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
++ Stack = &yyptr->Stack_alloc; \
++ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
++ yyptr += yynewbytes / sizeof (*yyptr); \
++ } \
++ while (0)
+
+ #endif
+
+@@ -421,7 +431,7 @@
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (Dst)[yyi] = (Src)[yyi]; \
+ } \
+- while (YYID (0))
++ while (0)
+ # endif
+ # endif
+ #endif /* !YYCOPY_NEEDED */
+@@ -429,25 +439,27 @@
+ /* YYFINAL -- State number of the termination state. */
+ #define YYFINAL 4
+ /* YYLAST -- Last index in YYTABLE. */
+-#define YYLAST 133
++#define YYLAST 135
+
+ /* YYNTOKENS -- Number of terminals. */
+ #define YYNTOKENS 48
+ /* YYNNTS -- Number of nonterminals. */
+-#define YYNNTS 28
++#define YYNNTS 29
+ /* YYNRULES -- Number of rules. */
+-#define YYNRULES 79
+-/* YYNRULES -- Number of states. */
+-#define YYNSTATES 141
++#define YYNRULES 81
++/* YYNSTATES -- Number of states. */
++#define YYNSTATES 144
+
+-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
++/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
++ by yylex, with out-of-bounds checking. */
+ #define YYUNDEFTOK 2
+ #define YYMAXUTOK 279
+
+-#define YYTRANSLATE(YYX) \
++#define YYTRANSLATE(YYX) \
+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
++/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
++ as returned by yylex, without out-of-bounds checking. */
+ static const yytype_uint8 yytranslate[] =
+ {
+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+@@ -481,63 +493,18 @@
+ };
+
+ #if YYDEBUG
+-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+- YYRHS. */
+-static const yytype_uint16 yyprhs[] =
+-{
+- 0, 0, 3, 8, 9, 12, 17, 20, 23, 27,
+- 31, 36, 42, 43, 46, 51, 54, 58, 61, 64,
+- 68, 73, 76, 86, 92, 95, 96, 99, 102, 106,
+- 108, 111, 114, 117, 119, 121, 125, 127, 129, 135,
+- 137, 141, 143, 147, 149, 153, 155, 159, 161, 165,
+- 167, 171, 175, 177, 181, 185, 189, 193, 197, 201,
+- 203, 207, 211, 213, 217, 221, 225, 227, 229, 232,
+- 235, 238, 239, 242, 245, 246, 249, 252, 255, 259
+-};
+-
+-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+-static const yytype_int8 yyrhs[] =
+-{
+- 49, 0, -1, 3, 25, 50, 52, -1, -1, 51,
+- 50, -1, 4, 59, 59, 25, -1, 22, 51, -1,
+- 26, 53, -1, 52, 26, 53, -1, 52, 23, 53,
+- -1, 52, 15, 23, 25, -1, 27, 54, 74, 28,
+- 25, -1, -1, 54, 55, -1, 16, 29, 56, 25,
+- -1, 16, 25, -1, 14, 16, 25, -1, 22, 55,
+- -1, 57, 21, -1, 57, 58, 30, -1, 57, 31,
+- 73, 32, -1, 57, 23, -1, 57, 24, 33, 21,
+- 34, 59, 34, 59, 35, -1, 57, 24, 33, 21,
+- 35, -1, 56, 22, -1, -1, 56, 34, -1, 57,
+- 22, -1, 13, 17, 36, -1, 36, -1, 58, 59,
+- -1, 58, 23, -1, 58, 22, -1, 17, -1, 18,
+- -1, 33, 60, 35, -1, 61, -1, 62, -1, 62,
+- 37, 60, 38, 61, -1, 63, -1, 62, 12, 63,
+- -1, 64, -1, 63, 11, 64, -1, 65, -1, 64,
+- 39, 65, -1, 66, -1, 65, 40, 66, -1, 67,
+- -1, 66, 41, 67, -1, 68, -1, 67, 9, 68,
+- -1, 67, 10, 68, -1, 69, -1, 68, 36, 69,
+- -1, 68, 30, 69, -1, 68, 7, 69, -1, 68,
+- 8, 69, -1, 69, 5, 70, -1, 69, 6, 70,
+- -1, 70, -1, 70, 42, 71, -1, 70, 43, 71,
+- -1, 71, -1, 71, 44, 72, -1, 71, 26, 72,
+- -1, 71, 45, 72, -1, 72, -1, 59, -1, 43,
+- 72, -1, 46, 72, -1, 47, 72, -1, -1, 73,
+- 20, -1, 73, 22, -1, -1, 75, 74, -1, 75,
+- 55, -1, 16, 53, -1, 15, 16, 25, -1, 22,
+- 75, -1
+-};
+-
+-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
++ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
+ static const yytype_uint16 yyrline[] =
+ {
+- 0, 109, 109, 118, 121, 128, 132, 140, 144, 148,
+- 158, 172, 180, 183, 190, 194, 198, 202, 210, 214,
+- 218, 222, 226, 243, 253, 261, 264, 268, 275, 290,
+- 295, 315, 329, 336, 340, 344, 351, 355, 356, 360,
+- 361, 365, 366, 370, 371, 375, 376, 380, 381, 385,
+- 386, 387, 391, 392, 393, 394, 395, 399, 400, 401,
+- 405, 406, 407, 411, 412, 413, 414, 418, 419, 420,
+- 421, 426, 429, 433, 441, 444, 448, 456, 460, 464
++ 0, 108, 108, 119, 122, 130, 133, 140, 144, 152,
++ 156, 160, 170, 185, 193, 196, 203, 207, 211, 215,
++ 223, 227, 231, 235, 239, 255, 265, 273, 276, 280,
++ 287, 303, 308, 327, 341, 348, 349, 350, 357, 361,
++ 362, 366, 367, 371, 372, 376, 377, 381, 382, 386,
++ 387, 391, 392, 393, 397, 398, 399, 400, 401, 405,
++ 406, 407, 411, 412, 413, 417, 418, 419, 420, 424,
++ 425, 426, 427, 432, 435, 439, 447, 450, 454, 462,
++ 466, 470
+ };
+ #endif
+
+@@ -546,25 +513,25 @@
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+ static const char *const yytname[] =
+ {
+- "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE", "DT_LSHIFT",
+- "DT_RSHIFT", "DT_LE", "DT_GE", "DT_EQ", "DT_NE", "DT_AND", "DT_OR",
+- "DT_BITS", "DT_DEL_PROP", "DT_DEL_NODE", "DT_PROPNODENAME", "DT_LITERAL",
+- "DT_CHAR_LITERAL", "DT_BASE", "DT_BYTE", "DT_STRING", "DT_LABEL",
++ "$end", "error", "$undefined", "DT_V1", "DT_PLUGIN", "DT_MEMRESERVE",
++ "DT_LSHIFT", "DT_RSHIFT", "DT_LE", "DT_GE", "DT_EQ", "DT_NE", "DT_AND",
++ "DT_OR", "DT_BITS", "DT_DEL_PROP", "DT_DEL_NODE", "DT_PROPNODENAME",
++ "DT_LITERAL", "DT_CHAR_LITERAL", "DT_BYTE", "DT_STRING", "DT_LABEL",
+ "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='", "'>'", "'['",
+ "']'", "'('", "','", "')'", "'<'", "'?'", "':'", "'|'", "'^'", "'&'",
+ "'+'", "'-'", "'*'", "'%'", "'~'", "'!'", "$accept", "sourcefile",
+- "memreserves", "memreserve", "devicetree", "nodedef", "proplist",
+- "propdef", "propdata", "propdataprefix", "arrayprefix", "integer_prim",
+- "integer_expr", "integer_trinary", "integer_or", "integer_and",
+- "integer_bitor", "integer_bitxor", "integer_bitand", "integer_eq",
+- "integer_rela", "integer_shift", "integer_add", "integer_mul",
+- "integer_unary", "bytestring", "subnodes", "subnode", YY_NULL
++ "plugindecl", "memreserves", "memreserve", "devicetree", "nodedef",
++ "proplist", "propdef", "propdata", "propdataprefix", "arrayprefix",
++ "integer_prim", "integer_expr", "integer_trinary", "integer_or",
++ "integer_and", "integer_bitor", "integer_bitxor", "integer_bitand",
++ "integer_eq", "integer_rela", "integer_shift", "integer_add",
++ "integer_mul", "integer_unary", "bytestring", "subnodes", "subnode", YY_NULLPTR
+ };
+ #endif
+
+ # ifdef YYPRINT
+-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+- token YYLEX-NUM. */
++/* YYTOKNUM[NUM] -- (External) token number corresponding to the
++ (internal) symbol number NUM (which must be that of a token). */
+ static const yytype_uint16 yytoknum[] =
+ {
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+@@ -575,183 +542,173 @@
+ };
+ # endif
+
+-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+-static const yytype_uint8 yyr1[] =
+-{
+- 0, 48, 49, 50, 50, 51, 51, 52, 52, 52,
+- 52, 53, 54, 54, 55, 55, 55, 55, 56, 56,
+- 56, 56, 56, 56, 56, 57, 57, 57, 58, 58,
+- 58, 58, 58, 59, 59, 59, 60, 61, 61, 62,
+- 62, 63, 63, 64, 64, 65, 65, 66, 66, 67,
+- 67, 67, 68, 68, 68, 68, 68, 69, 69, 69,
+- 70, 70, 70, 71, 71, 71, 71, 72, 72, 72,
+- 72, 73, 73, 73, 74, 74, 74, 75, 75, 75
+-};
++#define YYPACT_NINF -41
+
+-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+-static const yytype_uint8 yyr2[] =
++#define yypact_value_is_default(Yystate) \
++ (!!((Yystate) == (-41)))
++
++#define YYTABLE_NINF -1
++
++#define yytable_value_is_error(Yytable_value) \
++ 0
++
++ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
++ STATE-NUM. */
++static const yytype_int8 yypact[] =
+ {
+- 0, 2, 4, 0, 2, 4, 2, 2, 3, 3,
+- 4, 5, 0, 2, 4, 2, 3, 2, 2, 3,
+- 4, 2, 9, 5, 2, 0, 2, 2, 3, 1,
+- 2, 2, 2, 1, 1, 3, 1, 1, 5, 1,
+- 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
+- 3, 3, 1, 3, 3, 3, 3, 3, 3, 1,
+- 3, 3, 1, 3, 3, 3, 1, 1, 2, 2,
+- 2, 0, 2, 2, 0, 2, 2, 2, 3, 2
++ 37, 10, 24, 78, -41, 20, 9, -41, 8, 9,
++ 59, 9, -41, -41, -10, 8, -41, 60, 39, -41,
++ -10, -10, -10, -41, 51, -41, -7, 76, 50, 52,
++ 53, 49, 2, 65, 32, -1, -41, 66, -41, -41,
++ 67, 60, 60, -41, -41, -41, -41, -10, -10, -10,
++ -10, -10, -10, -10, -10, -10, -10, -10, -10, -10,
++ -10, -10, -10, -10, -10, -10, -41, 41, 68, -41,
++ -41, 76, 57, 50, 52, 53, 49, 2, 2, 65,
++ 65, 65, 65, 32, 32, -1, -1, -41, -41, -41,
++ 79, 80, -12, 41, -41, 70, 41, -41, -10, 74,
++ 75, -41, -41, -41, -41, -41, 77, -41, -41, -41,
++ -41, -41, 17, -2, -41, -41, -41, -41, 83, -41,
++ -41, -41, 71, -41, -41, 31, 69, 82, -4, -41,
++ -41, -41, -41, -41, 42, -41, -41, -41, 8, -41,
++ 72, 8, 73, -41
+ };
+
+-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+- Performed when YYTABLE doesn't specify something else to do. Zero
+- means the default is an error. */
++ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
++ Performed when YYTABLE does not specify something else to do. Zero
++ means the default is an error. */
+ static const yytype_uint8 yydefact[] =
+ {
+- 0, 0, 0, 3, 1, 0, 0, 0, 3, 33,
+- 34, 0, 0, 6, 0, 2, 4, 0, 0, 0,
+- 67, 0, 36, 37, 39, 41, 43, 45, 47, 49,
+- 52, 59, 62, 66, 0, 12, 7, 0, 0, 0,
+- 68, 69, 70, 35, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 3, 1, 0, 5, 4, 0, 0,
++ 0, 5, 35, 36, 0, 0, 8, 0, 2, 6,
++ 0, 0, 0, 69, 0, 38, 39, 41, 43, 45,
++ 47, 49, 51, 54, 61, 64, 68, 0, 14, 9,
++ 0, 0, 0, 70, 71, 72, 37, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 5, 74, 0, 9, 8, 40, 0,
+- 42, 44, 46, 48, 50, 51, 55, 56, 54, 53,
+- 57, 58, 60, 61, 64, 63, 65, 0, 0, 0,
+- 0, 13, 0, 74, 10, 0, 0, 0, 15, 25,
+- 77, 17, 79, 0, 76, 75, 38, 16, 78, 0,
+- 0, 11, 24, 14, 26, 0, 18, 27, 21, 0,
+- 71, 29, 0, 0, 0, 0, 32, 31, 19, 30,
+- 28, 0, 72, 73, 20, 0, 23, 0, 0, 0,
+- 22
++ 0, 0, 0, 0, 0, 0, 7, 76, 0, 11,
++ 10, 42, 0, 44, 46, 48, 50, 52, 53, 57,
++ 58, 56, 55, 59, 60, 62, 63, 66, 65, 67,
++ 0, 0, 0, 0, 15, 0, 76, 12, 0, 0,
++ 0, 17, 27, 79, 19, 81, 0, 78, 77, 40,
++ 18, 80, 0, 0, 13, 26, 16, 28, 0, 20,
++ 29, 23, 0, 73, 31, 0, 0, 0, 0, 34,
++ 33, 21, 32, 30, 0, 74, 75, 22, 0, 25,
++ 0, 0, 0, 24
+ };
+
+-/* YYDEFGOTO[NTERM-NUM]. */
+-static const yytype_int8 yydefgoto[] =
++ /* YYPGOTO[NTERM-NUM]. */
++static const yytype_int8 yypgoto[] =
+ {
+- -1, 2, 7, 8, 15, 36, 64, 91, 109, 110,
+- 122, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+- 29, 30, 31, 32, 33, 125, 92, 93
++ -41, -41, -41, 96, 100, -41, -40, -41, -23, -41,
++ -41, -41, -8, 62, 13, -41, 81, 63, 64, 84,
++ 61, 25, 11, 21, 22, -17, -41, 19, 23
+ };
+
+-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+- STATE-NUM. */
+-#define YYPACT_NINF -78
+-static const yytype_int8 yypact[] =
++ /* YYDEFGOTO[NTERM-NUM]. */
++static const yytype_int16 yydefgoto[] =
+ {
+- 22, 11, 51, 10, -78, 23, 10, 2, 10, -78,
+- -78, -9, 23, -78, 30, 38, -78, -9, -9, -9,
+- -78, 35, -78, -6, 52, 29, 48, 49, 33, 3,
+- 71, 36, 0, -78, 64, -78, -78, 68, 30, 30,
+- -78, -78, -78, -78, -9, -9, -9, -9, -9, -9,
+- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+- -9, -9, -9, -78, 44, 67, -78, -78, 52, 55,
+- 29, 48, 49, 33, 3, 3, 71, 71, 71, 71,
+- 36, 36, 0, 0, -78, -78, -78, 78, 79, 42,
+- 44, -78, 69, 44, -78, -9, 73, 74, -78, -78,
+- -78, -78, -78, 75, -78, -78, -78, -78, -78, -7,
+- -1, -78, -78, -78, -78, 84, -78, -78, -78, 63,
+- -78, -78, 32, 66, 82, -3, -78, -78, -78, -78,
+- -78, 46, -78, -78, -78, 23, -78, 70, 23, 72,
+- -78
++ -1, 2, 6, 10, 11, 18, 39, 67, 94, 112,
++ 113, 125, 23, 24, 25, 26, 27, 28, 29, 30,
++ 31, 32, 33, 34, 35, 36, 128, 95, 96
+ };
+
+-/* YYPGOTO[NTERM-NUM]. */
+-static const yytype_int8 yypgoto[] =
++ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
++ positive, shift that token. If negative, reduce the rule whose
++ number is the opposite. If YYTABLE_NINF, syntax error. */
++static const yytype_uint8 yytable[] =
+ {
+- -78, -78, 97, 100, -78, -37, -78, -77, -78, -78,
+- -78, -5, 65, 13, -78, 76, 77, 62, 80, 83,
+- 34, 20, 26, 28, -14, -78, 18, 24
++ 15, 69, 70, 43, 44, 45, 47, 37, 12, 13,
++ 55, 56, 118, 101, 8, 38, 135, 102, 136, 119,
++ 120, 121, 122, 14, 4, 63, 12, 13, 137, 123,
++ 48, 9, 57, 20, 124, 3, 21, 22, 58, 115,
++ 1, 14, 116, 64, 65, 7, 87, 88, 89, 12,
++ 13, 117, 103, 129, 130, 40, 90, 91, 92, 53,
++ 54, 131, 41, 93, 14, 42, 79, 80, 81, 82,
++ 104, 59, 60, 107, 61, 62, 138, 139, 77, 78,
++ 83, 84, 5, 85, 86, 17, 46, 38, 49, 50,
++ 68, 66, 51, 97, 52, 98, 99, 100, 106, 110,
++ 111, 126, 114, 134, 127, 133, 141, 19, 143, 16,
++ 72, 109, 73, 76, 74, 108, 105, 132, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 71, 0,
++ 140, 0, 0, 142, 0, 75
+ };
+
+-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+- positive, shift that token. If negative, reduce the rule which
+- number is the opposite. If YYTABLE_NINF, syntax error. */
+-#define YYTABLE_NINF -1
+-static const yytype_uint8 yytable[] =
++static const yytype_int16 yycheck[] =
+ {
+- 12, 66, 67, 40, 41, 42, 44, 34, 9, 10,
+- 52, 53, 115, 101, 5, 112, 104, 132, 113, 133,
+- 116, 117, 118, 119, 11, 1, 60, 114, 14, 134,
+- 120, 45, 6, 54, 17, 121, 3, 18, 19, 55,
+- 9, 10, 50, 51, 61, 62, 84, 85, 86, 9,
+- 10, 4, 100, 37, 126, 127, 11, 35, 87, 88,
+- 89, 38, 128, 46, 39, 11, 90, 98, 47, 35,
+- 43, 99, 76, 77, 78, 79, 56, 57, 58, 59,
+- 135, 136, 80, 81, 74, 75, 82, 83, 48, 63,
+- 49, 65, 94, 95, 96, 97, 124, 103, 107, 108,
+- 111, 123, 130, 131, 138, 16, 13, 140, 106, 71,
+- 69, 105, 0, 0, 102, 0, 0, 129, 0, 0,
+- 68, 0, 0, 70, 0, 0, 0, 0, 72, 0,
+- 137, 0, 73, 139
++ 8, 41, 42, 20, 21, 22, 13, 15, 18, 19,
++ 8, 9, 14, 25, 5, 27, 20, 29, 22, 21,
++ 22, 23, 24, 33, 0, 26, 18, 19, 32, 31,
++ 37, 22, 30, 43, 36, 25, 46, 47, 36, 22,
++ 3, 33, 25, 44, 45, 25, 63, 64, 65, 18,
++ 19, 34, 92, 22, 23, 16, 15, 16, 17, 10,
++ 11, 30, 23, 22, 33, 26, 55, 56, 57, 58,
++ 93, 6, 7, 96, 42, 43, 34, 35, 53, 54,
++ 59, 60, 4, 61, 62, 26, 35, 27, 12, 39,
++ 23, 25, 40, 25, 41, 38, 17, 17, 28, 25,
++ 25, 18, 25, 21, 33, 36, 34, 11, 35, 9,
++ 48, 98, 49, 52, 50, 96, 93, 125, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, 47, -1,
++ 138, -1, -1, 141, -1, 51
+ };
+
+-#define yypact_value_is_default(Yystate) \
+- (!!((Yystate) == (-78)))
+-
+-#define yytable_value_is_error(Yytable_value) \
+- YYID (0)
++ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
++ symbol of state STATE-NUM. */
++static const yytype_uint8 yystos[] =
++{
++ 0, 3, 49, 25, 0, 4, 50, 25, 5, 22,
++ 51, 52, 18, 19, 33, 60, 52, 26, 53, 51,
++ 43, 46, 47, 60, 61, 62, 63, 64, 65, 66,
++ 67, 68, 69, 70, 71, 72, 73, 60, 27, 54,
++ 16, 23, 26, 73, 73, 73, 35, 13, 37, 12,
++ 39, 40, 41, 10, 11, 8, 9, 30, 36, 6,
++ 7, 42, 43, 26, 44, 45, 25, 55, 23, 54,
++ 54, 64, 61, 65, 66, 67, 68, 69, 69, 70,
++ 70, 70, 70, 71, 71, 72, 72, 73, 73, 73,
++ 15, 16, 17, 22, 56, 75, 76, 25, 38, 17,
++ 17, 25, 29, 54, 56, 76, 28, 56, 75, 62,
++ 25, 25, 57, 58, 25, 22, 25, 34, 14, 21,
++ 22, 23, 24, 31, 36, 59, 18, 33, 74, 22,
++ 23, 30, 60, 36, 21, 20, 22, 32, 34, 35,
++ 60, 34, 60, 35
++};
+
+-static const yytype_int16 yycheck[] =
++ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
++static const yytype_uint8 yyr1[] =
+ {
+- 5, 38, 39, 17, 18, 19, 12, 12, 17, 18,
+- 7, 8, 13, 90, 4, 22, 93, 20, 25, 22,
+- 21, 22, 23, 24, 33, 3, 26, 34, 26, 32,
+- 31, 37, 22, 30, 43, 36, 25, 46, 47, 36,
+- 17, 18, 9, 10, 44, 45, 60, 61, 62, 17,
+- 18, 0, 89, 15, 22, 23, 33, 27, 14, 15,
+- 16, 23, 30, 11, 26, 33, 22, 25, 39, 27,
+- 35, 29, 52, 53, 54, 55, 5, 6, 42, 43,
+- 34, 35, 56, 57, 50, 51, 58, 59, 40, 25,
+- 41, 23, 25, 38, 16, 16, 33, 28, 25, 25,
+- 25, 17, 36, 21, 34, 8, 6, 35, 95, 47,
+- 45, 93, -1, -1, 90, -1, -1, 122, -1, -1,
+- 44, -1, -1, 46, -1, -1, -1, -1, 48, -1,
+- 135, -1, 49, 138
++ 0, 48, 49, 50, 50, 51, 51, 52, 52, 53,
++ 53, 53, 53, 54, 55, 55, 56, 56, 56, 56,
++ 57, 57, 57, 57, 57, 57, 57, 58, 58, 58,
++ 59, 59, 59, 59, 59, 60, 60, 60, 61, 62,
++ 62, 63, 63, 64, 64, 65, 65, 66, 66, 67,
++ 67, 68, 68, 68, 69, 69, 69, 69, 69, 70,
++ 70, 70, 71, 71, 71, 72, 72, 72, 72, 73,
++ 73, 73, 73, 74, 74, 74, 75, 75, 75, 76,
++ 76, 76
+ };
+
+-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+- symbol of state STATE-NUM. */
+-static const yytype_uint8 yystos[] =
++ /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
++static const yytype_uint8 yyr2[] =
+ {
+- 0, 3, 49, 25, 0, 4, 22, 50, 51, 17,
+- 18, 33, 59, 51, 26, 52, 50, 43, 46, 47,
+- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+- 69, 70, 71, 72, 59, 27, 53, 15, 23, 26,
+- 72, 72, 72, 35, 12, 37, 11, 39, 40, 41,
+- 9, 10, 7, 8, 30, 36, 5, 6, 42, 43,
+- 26, 44, 45, 25, 54, 23, 53, 53, 63, 60,
+- 64, 65, 66, 67, 68, 68, 69, 69, 69, 69,
+- 70, 70, 71, 71, 72, 72, 72, 14, 15, 16,
+- 22, 55, 74, 75, 25, 38, 16, 16, 25, 29,
+- 53, 55, 75, 28, 55, 74, 61, 25, 25, 56,
+- 57, 25, 22, 25, 34, 13, 21, 22, 23, 24,
+- 31, 36, 58, 17, 33, 73, 22, 23, 30, 59,
+- 36, 21, 20, 22, 32, 34, 35, 59, 34, 59,
+- 35
++ 0, 2, 5, 0, 2, 0, 2, 4, 2, 2,
++ 3, 3, 4, 5, 0, 2, 4, 2, 3, 2,
++ 2, 3, 4, 2, 9, 5, 2, 0, 2, 2,
++ 3, 1, 2, 2, 2, 1, 1, 3, 1, 1,
++ 5, 1, 3, 1, 3, 1, 3, 1, 3, 1,
++ 3, 1, 3, 3, 1, 3, 3, 3, 3, 3,
++ 3, 1, 3, 3, 1, 3, 3, 3, 1, 1,
++ 2, 2, 2, 0, 2, 2, 0, 2, 2, 2,
++ 3, 2
+ };
+
+-#define yyerrok (yyerrstatus = 0)
+-#define yyclearin (yychar = YYEMPTY)
+-#define YYEMPTY (-2)
+-#define YYEOF 0
+-
+-#define YYACCEPT goto yyacceptlab
+-#define YYABORT goto yyabortlab
+-#define YYERROR goto yyerrorlab
+-
+-
+-/* Like YYERROR except do call yyerror. This remains here temporarily
+- to ease the transition to the new meaning of YYERROR, for GCC.
+- Once GCC version 2 has supplanted version 1, this can go. However,
+- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+- discussed. */
+-
+-#define YYFAIL goto yyerrlab
+-#if defined YYFAIL
+- /* This is here to suppress warnings from the GCC cpp's
+- -Wunused-macros. Normally we don't worry about that warning, but
+- some users do, and we want to make it easy for users to remove
+- YYFAIL uses, which will produce warnings from Bison 2.5. */
+-#endif
++
++#define yyerrok (yyerrstatus = 0)
++#define yyclearin (yychar = YYEMPTY)
++#define YYEMPTY (-2)
++#define YYEOF 0
++
++#define YYACCEPT goto yyacceptlab
++#define YYABORT goto yyabortlab
++#define YYERROR goto yyerrorlab
++
+
+ #define YYRECOVERING() (!!yyerrstatus)
+
+@@ -768,27 +725,41 @@
+ else \
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
+- YYERROR; \
+- } \
+-while (YYID (0))
++ YYERROR; \
++ } \
++while (0)
+
+ /* Error token number */
+-#define YYTERROR 1
+-#define YYERRCODE 256
++#define YYTERROR 1
++#define YYERRCODE 256
+
+
+-/* This macro is provided for backward compatibility. */
+-#ifndef YY_LOCATION_PRINT
+-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
++/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
++ If N is 0, then set CURRENT to the empty location which ends
++ the previous symbol: RHS[0] (always defined). */
++
++#ifndef YYLLOC_DEFAULT
++# define YYLLOC_DEFAULT(Current, Rhs, N) \
++ do \
++ if (N) \
++ { \
++ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
++ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
++ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
++ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
++ } \
++ else \
++ { \
++ (Current).first_line = (Current).last_line = \
++ YYRHSLOC (Rhs, 0).last_line; \
++ (Current).first_column = (Current).last_column = \
++ YYRHSLOC (Rhs, 0).last_column; \
++ } \
++ while (0)
+ #endif
+
++#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+-/* YYLEX -- calling `yylex' with the right arguments. */
+-#ifdef YYLEX_PARAM
+-# define YYLEX yylex (YYLEX_PARAM)
+-#else
+-# define YYLEX yylex ()
+-#endif
+
+ /* Enable debugging if requested. */
+ #if YYDEBUG
+@@ -798,50 +769,84 @@
+ # define YYFPRINTF fprintf
+ # endif
+
+-# define YYDPRINTF(Args) \
+-do { \
+- if (yydebug) \
+- YYFPRINTF Args; \
+-} while (YYID (0))
+-
+-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+-do { \
+- if (yydebug) \
+- { \
+- YYFPRINTF (stderr, "%s ", Title); \
+- yy_symbol_print (stderr, \
+- Type, Value); \
+- YYFPRINTF (stderr, "\n"); \
+- } \
+-} while (YYID (0))
++# define YYDPRINTF(Args) \
++do { \
++ if (yydebug) \
++ YYFPRINTF Args; \
++} while (0)
+
+
+-/*--------------------------------.
+-| Print this symbol on YYOUTPUT. |
+-`--------------------------------*/
++/* YY_LOCATION_PRINT -- Print the location on the stream.
++ This macro was not mandated originally: define only if we know
++ we won't break user code: when these are the locations we know. */
+
+-/*ARGSUSED*/
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-static void
+-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+-#else
+-static void
+-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+- FILE *yyoutput;
+- int yytype;
+- YYSTYPE const * const yyvaluep;
++#ifndef YY_LOCATION_PRINT
++# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
++
++/* Print *YYLOCP on YYO. Private, do not rely on its existence. */
++
++YY_ATTRIBUTE_UNUSED
++static unsigned
++yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
++{
++ unsigned res = 0;
++ int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
++ if (0 <= yylocp->first_line)
++ {
++ res += YYFPRINTF (yyo, "%d", yylocp->first_line);
++ if (0 <= yylocp->first_column)
++ res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
++ }
++ if (0 <= yylocp->last_line)
++ {
++ if (yylocp->first_line < yylocp->last_line)
++ {
++ res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
++ if (0 <= end_col)
++ res += YYFPRINTF (yyo, ".%d", end_col);
++ }
++ else if (0 <= end_col && yylocp->first_column < end_col)
++ res += YYFPRINTF (yyo, "-%d", end_col);
++ }
++ return res;
++ }
++
++# define YY_LOCATION_PRINT(File, Loc) \
++ yy_location_print_ (File, &(Loc))
++
++# else
++# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
++# endif
+ #endif
++
++
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
++do { \
++ if (yydebug) \
++ { \
++ YYFPRINTF (stderr, "%s ", Title); \
++ yy_symbol_print (stderr, \
++ Type, Value, Location); \
++ YYFPRINTF (stderr, "\n"); \
++ } \
++} while (0)
++
++
++/*----------------------------------------.
++| Print this symbol's value on YYOUTPUT. |
++`----------------------------------------*/
++
++static void
++yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+ {
+ FILE *yyo = yyoutput;
+ YYUSE (yyo);
++ YYUSE (yylocationp);
+ if (!yyvaluep)
+ return;
+ # ifdef YYPRINT
+ if (yytype < YYNTOKENS)
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+-# else
+- YYUSE (yyoutput);
+ # endif
+ YYUSE (yytype);
+ }
+@@ -851,24 +856,15 @@
+ | Print this symbol on YYOUTPUT. |
+ `--------------------------------*/
+
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-static void
+-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+-#else
+ static void
+-yy_symbol_print (yyoutput, yytype, yyvaluep)
+- FILE *yyoutput;
+- int yytype;
+- YYSTYPE const * const yyvaluep;
+-#endif
++yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+ {
+- if (yytype < YYNTOKENS)
+- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+- else
+- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
++ YYFPRINTF (yyoutput, "%s %s (",
++ yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
++ YY_LOCATION_PRINT (yyoutput, *yylocationp);
++ YYFPRINTF (yyoutput, ": ");
++ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp);
+ YYFPRINTF (yyoutput, ")");
+ }
+
+@@ -877,16 +873,8 @@
+ | TOP (included). |
+ `------------------------------------------------------------------*/
+
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+ static void
+ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+-#else
+-static void
+-yy_stack_print (yybottom, yytop)
+- yytype_int16 *yybottom;
+- yytype_int16 *yytop;
+-#endif
+ {
+ YYFPRINTF (stderr, "Stack now");
+ for (; yybottom <= yytop; yybottom++)
+@@ -897,49 +885,42 @@
+ YYFPRINTF (stderr, "\n");
+ }
+
+-# define YY_STACK_PRINT(Bottom, Top) \
+-do { \
+- if (yydebug) \
+- yy_stack_print ((Bottom), (Top)); \
+-} while (YYID (0))
++# define YY_STACK_PRINT(Bottom, Top) \
++do { \
++ if (yydebug) \
++ yy_stack_print ((Bottom), (Top)); \
++} while (0)
+
+
+ /*------------------------------------------------.
+ | Report that the YYRULE is going to be reduced. |
+ `------------------------------------------------*/
+
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-static void
+-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+-#else
+ static void
+-yy_reduce_print (yyvsp, yyrule)
+- YYSTYPE *yyvsp;
+- int yyrule;
+-#endif
++yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+ {
++ unsigned long int yylno = yyrline[yyrule];
+ int yynrhs = yyr2[yyrule];
+ int yyi;
+- unsigned long int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+- yyrule - 1, yylno);
++ yyrule - 1, yylno);
+ /* The symbols being reduced. */
+ for (yyi = 0; yyi < yynrhs; yyi++)
+ {
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+- &(yyvsp[(yyi + 1) - (yynrhs)])
+- );
++ yy_symbol_print (stderr,
++ yystos[yyssp[yyi + 1 - yynrhs]],
++ &(yyvsp[(yyi + 1) - (yynrhs)])
++ , &(yylsp[(yyi + 1) - (yynrhs)]) );
+ YYFPRINTF (stderr, "\n");
+ }
+ }
+
+-# define YY_REDUCE_PRINT(Rule) \
+-do { \
+- if (yydebug) \
+- yy_reduce_print (yyvsp, Rule); \
+-} while (YYID (0))
++# define YY_REDUCE_PRINT(Rule) \
++do { \
++ if (yydebug) \
++ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
++} while (0)
+
+ /* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+@@ -953,7 +934,7 @@
+
+
+ /* YYINITDEPTH -- initial size of the parser's stacks. */
+-#ifndef YYINITDEPTH
++#ifndef YYINITDEPTH
+ # define YYINITDEPTH 200
+ #endif
+
+@@ -976,15 +957,8 @@
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+ static YYSIZE_T
+ yystrlen (const char *yystr)
+-#else
+-static YYSIZE_T
+-yystrlen (yystr)
+- const char *yystr;
+-#endif
+ {
+ YYSIZE_T yylen;
+ for (yylen = 0; yystr[yylen]; yylen++)
+@@ -1000,16 +974,8 @@
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ YYDEST. */
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+ static char *
+ yystpcpy (char *yydest, const char *yysrc)
+-#else
+-static char *
+-yystpcpy (yydest, yysrc)
+- char *yydest;
+- const char *yysrc;
+-#endif
+ {
+ char *yyd = yydest;
+ const char *yys = yysrc;
+@@ -1039,27 +1005,27 @@
+ char const *yyp = yystr;
+
+ for (;;)
+- switch (*++yyp)
+- {
+- case '\'':
+- case ',':
+- goto do_not_strip_quotes;
+-
+- case '\\':
+- if (*++yyp != '\\')
+- goto do_not_strip_quotes;
+- /* Fall through. */
+- default:
+- if (yyres)
+- yyres[yyn] = *yyp;
+- yyn++;
+- break;
+-
+- case '"':
+- if (yyres)
+- yyres[yyn] = '\0';
+- return yyn;
+- }
++ switch (*++yyp)
++ {
++ case '\'':
++ case ',':
++ goto do_not_strip_quotes;
++
++ case '\\':
++ if (*++yyp != '\\')
++ goto do_not_strip_quotes;
++ /* Fall through. */
++ default:
++ if (yyres)
++ yyres[yyn] = *yyp;
++ yyn++;
++ break;
++
++ case '"':
++ if (yyres)
++ yyres[yyn] = '\0';
++ return yyn;
++ }
+ do_not_strip_quotes: ;
+ }
+
+@@ -1082,11 +1048,11 @@
+ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+ {
+- YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
++ YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+- const char *yyformat = YY_NULL;
++ const char *yyformat = YY_NULLPTR;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+@@ -1094,10 +1060,6 @@
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+- - Assume YYFAIL is not used. It's too flawed to consider. See
+- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+- for details. YYERROR is fine as it does not invoke this
+- function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+@@ -1147,7 +1109,7 @@
+ }
+ yyarg[yycount++] = yytname[yyx];
+ {
+- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
++ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+@@ -1214,26 +1176,18 @@
+ | Release the memory associated to this symbol. |
+ `-----------------------------------------------*/
+
+-/*ARGSUSED*/
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-static void
+-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+-#else
+ static void
+-yydestruct (yymsg, yytype, yyvaluep)
+- const char *yymsg;
+- int yytype;
+- YYSTYPE *yyvaluep;
+-#endif
++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+ {
+ YYUSE (yyvaluep);
+-
++ YYUSE (yylocationp);
+ if (!yymsg)
+ yymsg = "Deleting";
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ YYUSE (yytype);
++ YY_IGNORE_MAYBE_UNINITIALIZED_END
+ }
+
+
+@@ -1242,18 +1196,14 @@
+ /* The lookahead symbol. */
+ int yychar;
+
+-
+-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+-#endif
+-#ifndef YY_INITIAL_VALUE
+-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+-#endif
+-
+ /* The semantic value of the lookahead symbol. */
+-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
+-
++YYSTYPE yylval;
++/* Location data for the lookahead symbol. */
++YYLTYPE yylloc
++# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
++ = { 1, 1, 1, 1 }
++# endif
++;
+ /* Number of syntax errors so far. */
+ int yynerrs;
+
+@@ -1262,35 +1212,17 @@
+ | yyparse. |
+ `----------*/
+
+-#ifdef YYPARSE_PARAM
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+-int
+-yyparse (void *YYPARSE_PARAM)
+-#else
+-int
+-yyparse (YYPARSE_PARAM)
+- void *YYPARSE_PARAM;
+-#endif
+-#else /* ! YYPARSE_PARAM */
+-#if (defined __STDC__ || defined __C99__FUNC__ \
+- || defined __cplusplus || defined _MSC_VER)
+ int
+ yyparse (void)
+-#else
+-int
+-yyparse ()
+-
+-#endif
+-#endif
+ {
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+
+ /* The stacks and their tools:
+- `yyss': related to states.
+- `yyvs': related to semantic values.
++ 'yyss': related to states.
++ 'yyvs': related to semantic values.
++ 'yyls': related to locations.
+
+ Refer to the stacks through separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+@@ -1305,6 +1237,14 @@
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
+
++ /* The location stack. */
++ YYLTYPE yylsa[YYINITDEPTH];
++ YYLTYPE *yyls;
++ YYLTYPE *yylsp;
++
++ /* The locations where the error started and ended. */
++ YYLTYPE yyerror_range[3];
++
+ YYSIZE_T yystacksize;
+
+ int yyn;
+@@ -1314,6 +1254,7 @@
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
++ YYLTYPE yyloc;
+
+ #if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+@@ -1322,7 +1263,7 @@
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+ #endif
+
+-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
++#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+
+ /* The number of symbols on the RHS of the reduced rule.
+ Keep to zero when no symbol should be popped. */
+@@ -1330,6 +1271,7 @@
+
+ yyssp = yyss = yyssa;
+ yyvsp = yyvs = yyvsa;
++ yylsp = yyls = yylsa;
+ yystacksize = YYINITDEPTH;
+
+ YYDPRINTF ((stderr, "Starting parse\n"));
+@@ -1338,6 +1280,7 @@
+ yyerrstatus = 0;
+ yynerrs = 0;
+ yychar = YYEMPTY; /* Cause a token to be read. */
++ yylsp[0] = yylloc;
+ goto yysetstate;
+
+ /*------------------------------------------------------------.
+@@ -1358,23 +1301,26 @@
+
+ #ifdef yyoverflow
+ {
+- /* Give user a chance to reallocate the stack. Use copies of
+- these so that the &'s don't force the real ones into
+- memory. */
+- YYSTYPE *yyvs1 = yyvs;
+- yytype_int16 *yyss1 = yyss;
+-
+- /* Each stack pointer address is followed by the size of the
+- data in use in that stack, in bytes. This used to be a
+- conditional around just the two extra args, but that might
+- be undefined if yyoverflow is a macro. */
+- yyoverflow (YY_("memory exhausted"),
+- &yyss1, yysize * sizeof (*yyssp),
+- &yyvs1, yysize * sizeof (*yyvsp),
+- &yystacksize);
+-
+- yyss = yyss1;
+- yyvs = yyvs1;
++ /* Give user a chance to reallocate the stack. Use copies of
++ these so that the &'s don't force the real ones into
++ memory. */
++ YYSTYPE *yyvs1 = yyvs;
++ yytype_int16 *yyss1 = yyss;
++ YYLTYPE *yyls1 = yyls;
++
++ /* Each stack pointer address is followed by the size of the
++ data in use in that stack, in bytes. This used to be a
++ conditional around just the two extra args, but that might
++ be undefined if yyoverflow is a macro. */
++ yyoverflow (YY_("memory exhausted"),
++ &yyss1, yysize * sizeof (*yyssp),
++ &yyvs1, yysize * sizeof (*yyvsp),
++ &yyls1, yysize * sizeof (*yylsp),
++ &yystacksize);
++
++ yyls = yyls1;
++ yyss = yyss1;
++ yyvs = yyvs1;
+ }
+ #else /* no yyoverflow */
+ # ifndef YYSTACK_RELOCATE
+@@ -1382,34 +1328,36 @@
+ # else
+ /* Extend the stack our own way. */
+ if (YYMAXDEPTH <= yystacksize)
+- goto yyexhaustedlab;
++ goto yyexhaustedlab;
+ yystacksize *= 2;
+ if (YYMAXDEPTH < yystacksize)
+- yystacksize = YYMAXDEPTH;
++ yystacksize = YYMAXDEPTH;
+
+ {
+- yytype_int16 *yyss1 = yyss;
+- union yyalloc *yyptr =
+- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+- if (! yyptr)
+- goto yyexhaustedlab;
+- YYSTACK_RELOCATE (yyss_alloc, yyss);
+- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
++ yytype_int16 *yyss1 = yyss;
++ union yyalloc *yyptr =
++ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
++ if (! yyptr)
++ goto yyexhaustedlab;
++ YYSTACK_RELOCATE (yyss_alloc, yyss);
++ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
++ YYSTACK_RELOCATE (yyls_alloc, yyls);
+ # undef YYSTACK_RELOCATE
+- if (yyss1 != yyssa)
+- YYSTACK_FREE (yyss1);
++ if (yyss1 != yyssa)
++ YYSTACK_FREE (yyss1);
+ }
+ # endif
+ #endif /* no yyoverflow */
+
+ yyssp = yyss + yysize - 1;
+ yyvsp = yyvs + yysize - 1;
++ yylsp = yyls + yysize - 1;
+
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+- (unsigned long int) yystacksize));
++ (unsigned long int) yystacksize));
+
+ if (yyss + yystacksize - 1 <= yyssp)
+- YYABORT;
++ YYABORT;
+ }
+
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+@@ -1438,7 +1386,7 @@
+ if (yychar == YYEMPTY)
+ {
+ YYDPRINTF ((stderr, "Reading a token: "));
+- yychar = YYLEX;
++ yychar = yylex ();
+ }
+
+ if (yychar <= YYEOF)
+@@ -1481,7 +1429,7 @@
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ *++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
+-
++ *++yylsp = yylloc;
+ goto yynewstate;
+
+
+@@ -1503,7 +1451,7 @@
+ yylen = yyr2[yyn];
+
+ /* If YYLEN is nonzero, implement the default value of the action:
+- `$$ = $1'.
++ '$$ = $1'.
+
+ Otherwise, the following line sets YYVAL to garbage.
+ This behavior is undocumented and Bison
+@@ -1512,287 +1460,306 @@
+ GCC warning that YYVAL may be used uninitialized. */
+ yyval = yyvsp[1-yylen];
+
+-
++ /* Default location. */
++ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+ YY_REDUCE_PRINT (yyn);
+ switch (yyn)
+ {
+ case 2:
+-/* Line 1787 of yacc.c */
+-#line 110 "dtc-parser.y"
++#line 109 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node),
+- guess_boot_cpuid((yyvsp[(4) - (4)].node)));
++ (yyvsp[0].node)->is_plugin = (yyvsp[-2].is_plugin);
++ (yyvsp[0].node)->is_root = 1;
++ the_boot_info = build_boot_info((yyvsp[-1].re), (yyvsp[0].node),
++ guess_boot_cpuid((yyvsp[0].node)));
+ }
++#line 1477 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 3:
+-/* Line 1787 of yacc.c */
+-#line 118 "dtc-parser.y"
++#line 119 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.re) = NULL;
++ (yyval.is_plugin) = 0;
+ }
++#line 1485 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 4:
+-/* Line 1787 of yacc.c */
+-#line 122 "dtc-parser.y"
++#line 123 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
++ (yyval.is_plugin) = 1;
+ }
++#line 1493 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 5:
+-/* Line 1787 of yacc.c */
+-#line 129 "dtc-parser.y"
++#line 130 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].integer), (yyvsp[(3) - (4)].integer));
++ (yyval.re) = NULL;
+ }
++#line 1501 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 6:
+-/* Line 1787 of yacc.c */
+-#line 133 "dtc-parser.y"
++#line 134 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- add_label(&(yyvsp[(2) - (2)].re)->labels, (yyvsp[(1) - (2)].labelref));
+- (yyval.re) = (yyvsp[(2) - (2)].re);
++ (yyval.re) = chain_reserve_entry((yyvsp[-1].re), (yyvsp[0].re));
+ }
++#line 1509 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 7:
+-/* Line 1787 of yacc.c */
+-#line 141 "dtc-parser.y"
++#line 141 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.node) = name_node((yyvsp[(2) - (2)].node), "");
++ (yyval.re) = build_reserve_entry((yyvsp[-2].integer), (yyvsp[-1].integer));
+ }
++#line 1517 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 8:
+-/* Line 1787 of yacc.c */
+-#line 145 "dtc-parser.y"
++#line 145 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
++ add_label(&(yyvsp[0].re)->labels, (yyvsp[-1].labelref));
++ (yyval.re) = (yyvsp[0].re);
+ }
++#line 1526 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 9:
+-/* Line 1787 of yacc.c */
+-#line 149 "dtc-parser.y"
++#line 153 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref));
+-
+- if (target)
+- merge_nodes(target, (yyvsp[(3) - (3)].node));
+- else
+- print_error("label or path, '%s', not found", (yyvsp[(2) - (3)].labelref));
+- (yyval.node) = (yyvsp[(1) - (3)].node);
++ (yyval.node) = name_node((yyvsp[0].node), "");
+ }
++#line 1534 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 10:
+-/* Line 1787 of yacc.c */
+-#line 159 "dtc-parser.y"
++#line 157 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- struct node *target = get_node_by_ref((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].labelref));
+-
+- if (!target)
+- print_error("label or path, '%s', not found", (yyvsp[(3) - (4)].labelref));
+- else
+- delete_node(target);
+-
+- (yyval.node) = (yyvsp[(1) - (4)].node);
++ (yyval.node) = merge_nodes((yyvsp[-2].node), (yyvsp[0].node));
+ }
++#line 1542 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 11:
+-/* Line 1787 of yacc.c */
+-#line 173 "dtc-parser.y"
++#line 161 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist));
++ struct node *target = get_node_by_ref((yyvsp[-2].node), (yyvsp[-1].labelref));
++
++ if (target)
++ merge_nodes(target, (yyvsp[0].node));
++ else
++ ERROR(&(yylsp[-1]), "Label or path %s not found", (yyvsp[-1].labelref));
++ (yyval.node) = (yyvsp[-2].node);
+ }
++#line 1556 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 12:
+-/* Line 1787 of yacc.c */
+-#line 180 "dtc-parser.y"
++#line 171 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.proplist) = NULL;
++ struct node *target = get_node_by_ref((yyvsp[-3].node), (yyvsp[-1].labelref));
++
++ if (target)
++ delete_node(target);
++ else
++ ERROR(&(yylsp[-1]), "Label or path %s not found", (yyvsp[-1].labelref));
++
++
++ (yyval.node) = (yyvsp[-3].node);
+ }
++#line 1572 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 13:
+-/* Line 1787 of yacc.c */
+-#line 184 "dtc-parser.y"
++#line 186 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist));
++ (yyval.node) = build_node((yyvsp[-3].proplist), (yyvsp[-2].nodelist));
+ }
++#line 1580 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 14:
+-/* Line 1787 of yacc.c */
+-#line 191 "dtc-parser.y"
++#line 193 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.prop) = build_property((yyvsp[(1) - (4)].propnodename), (yyvsp[(3) - (4)].data));
++ (yyval.proplist) = NULL;
+ }
++#line 1588 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 15:
+-/* Line 1787 of yacc.c */
+-#line 195 "dtc-parser.y"
++#line 197 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.prop) = build_property((yyvsp[(1) - (2)].propnodename), empty_data);
++ (yyval.proplist) = chain_property((yyvsp[0].prop), (yyvsp[-1].proplist));
+ }
++#line 1596 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 16:
+-/* Line 1787 of yacc.c */
+-#line 199 "dtc-parser.y"
++#line 204 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.prop) = build_property_delete((yyvsp[(2) - (3)].propnodename));
++ (yyval.prop) = build_property((yyvsp[-3].propnodename), (yyvsp[-1].data));
+ }
++#line 1604 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 17:
+-/* Line 1787 of yacc.c */
+-#line 203 "dtc-parser.y"
++#line 208 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- add_label(&(yyvsp[(2) - (2)].prop)->labels, (yyvsp[(1) - (2)].labelref));
+- (yyval.prop) = (yyvsp[(2) - (2)].prop);
++ (yyval.prop) = build_property((yyvsp[-1].propnodename), empty_data);
+ }
++#line 1612 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 18:
+-/* Line 1787 of yacc.c */
+-#line 211 "dtc-parser.y"
++#line 212 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data));
++ (yyval.prop) = build_property_delete((yyvsp[-1].propnodename));
+ }
++#line 1620 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 19:
+-/* Line 1787 of yacc.c */
+-#line 215 "dtc-parser.y"
++#line 216 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_merge((yyvsp[(1) - (3)].data), (yyvsp[(2) - (3)].array).data);
++ add_label(&(yyvsp[0].prop)->labels, (yyvsp[-1].labelref));
++ (yyval.prop) = (yyvsp[0].prop);
+ }
++#line 1629 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 20:
+-/* Line 1787 of yacc.c */
+-#line 219 "dtc-parser.y"
++#line 224 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
++ (yyval.data) = data_merge((yyvsp[-1].data), (yyvsp[0].data));
+ }
++#line 1637 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 21:
+-/* Line 1787 of yacc.c */
+-#line 223 "dtc-parser.y"
++#line 228 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref));
++ (yyval.data) = data_merge((yyvsp[-2].data), (yyvsp[-1].array).data);
+ }
++#line 1645 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 22:
+-/* Line 1787 of yacc.c */
+-#line 227 "dtc-parser.y"
++#line 232 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- FILE *f = srcfile_relative_open((yyvsp[(4) - (9)].data).val, NULL);
++ (yyval.data) = data_merge((yyvsp[-3].data), (yyvsp[-1].data));
++ }
++#line 1653 "dtc-parser.tab.c" /* yacc.c:1646 */
++ break;
++
++ case 23:
++#line 236 "dtc-parser.y" /* yacc.c:1646 */
++ {
++ (yyval.data) = data_add_marker((yyvsp[-1].data), REF_PATH, (yyvsp[0].labelref));
++ }
++#line 1661 "dtc-parser.tab.c" /* yacc.c:1646 */
++ break;
++
++ case 24:
++#line 240 "dtc-parser.y" /* yacc.c:1646 */
++ {
++ FILE *f = srcfile_relative_open((yyvsp[-5].data).val, NULL);
+ struct data d;
+
+- if ((yyvsp[(6) - (9)].integer) != 0)
+- if (fseek(f, (yyvsp[(6) - (9)].integer), SEEK_SET) != 0)
+- print_error("Couldn't seek to offset %llu in \"%s\": %s",
+- (unsigned long long)(yyvsp[(6) - (9)].integer),
+- (yyvsp[(4) - (9)].data).val,
+- strerror(errno));
++ if ((yyvsp[-3].integer) != 0)
++ if (fseek(f, (yyvsp[-3].integer), SEEK_SET) != 0)
++ die("Couldn't seek to offset %llu in \"%s\": %s",
++ (unsigned long long)(yyvsp[-3].integer), (yyvsp[-5].data).val,
++ strerror(errno));
+
+- d = data_copy_file(f, (yyvsp[(8) - (9)].integer));
++ d = data_copy_file(f, (yyvsp[-1].integer));
+
+- (yyval.data) = data_merge((yyvsp[(1) - (9)].data), d);
++ (yyval.data) = data_merge((yyvsp[-8].data), d);
+ fclose(f);
+ }
++#line 1681 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 23:
+-/* Line 1787 of yacc.c */
+-#line 244 "dtc-parser.y"
++ case 25:
++#line 256 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- FILE *f = srcfile_relative_open((yyvsp[(4) - (5)].data).val, NULL);
++ FILE *f = srcfile_relative_open((yyvsp[-1].data).val, NULL);
+ struct data d = empty_data;
+
+ d = data_copy_file(f, -1);
+
+- (yyval.data) = data_merge((yyvsp[(1) - (5)].data), d);
++ (yyval.data) = data_merge((yyvsp[-4].data), d);
+ fclose(f);
+ }
++#line 1695 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 24:
+-/* Line 1787 of yacc.c */
+-#line 254 "dtc-parser.y"
++ case 26:
++#line 266 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
++ (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
+ }
++#line 1703 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 25:
+-/* Line 1787 of yacc.c */
+-#line 261 "dtc-parser.y"
++ case 27:
++#line 273 "dtc-parser.y" /* yacc.c:1646 */
+ {
+ (yyval.data) = empty_data;
+ }
++#line 1711 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 26:
+-/* Line 1787 of yacc.c */
+-#line 265 "dtc-parser.y"
++ case 28:
++#line 277 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = (yyvsp[(1) - (2)].data);
++ (yyval.data) = (yyvsp[-1].data);
+ }
++#line 1719 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 27:
+-/* Line 1787 of yacc.c */
+-#line 269 "dtc-parser.y"
++ case 29:
++#line 281 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
++ (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
+ }
++#line 1727 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 28:
+-/* Line 1787 of yacc.c */
+-#line 276 "dtc-parser.y"
++ case 30:
++#line 288 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.array).data = empty_data;
+- (yyval.array).bits = eval_literal((yyvsp[(2) - (3)].literal), 0, 7);
++ unsigned long long bits;
+
+- if (((yyval.array).bits != 8) &&
+- ((yyval.array).bits != 16) &&
+- ((yyval.array).bits != 32) &&
+- ((yyval.array).bits != 64))
+- {
+- print_error("Only 8, 16, 32 and 64-bit elements"
+- " are currently supported");
+- (yyval.array).bits = 32;
++ bits = (yyvsp[-1].integer);
++
++ if ((bits != 8) && (bits != 16) &&
++ (bits != 32) && (bits != 64)) {
++ ERROR(&(yylsp[-1]), "Array elements must be"
++ " 8, 16, 32 or 64-bits");
++ bits = 32;
+ }
++
++ (yyval.array).data = empty_data;
++ (yyval.array).bits = bits;
+ }
++#line 1747 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 29:
+-/* Line 1787 of yacc.c */
+-#line 291 "dtc-parser.y"
++ case 31:
++#line 304 "dtc-parser.y" /* yacc.c:1646 */
+ {
+ (yyval.array).data = empty_data;
+ (yyval.array).bits = 32;
+ }
++#line 1756 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 30:
+-/* Line 1787 of yacc.c */
+-#line 296 "dtc-parser.y"
++ case 32:
++#line 309 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- if ((yyvsp[(1) - (2)].array).bits < 64) {
+- uint64_t mask = (1ULL << (yyvsp[(1) - (2)].array).bits) - 1;
++ if ((yyvsp[-1].array).bits < 64) {
++ uint64_t mask = (1ULL << (yyvsp[-1].array).bits) - 1;
+ /*
+ * Bits above mask must either be all zero
+ * (positive within range of mask) or all one
+@@ -1801,275 +1768,258 @@
+ * within the mask to one (i.e. | in the
+ * mask), all bits are one.
+ */
+- if (((yyvsp[(2) - (2)].integer) > mask) && (((yyvsp[(2) - (2)].integer) | mask) != -1ULL))
+- print_error(
+- "integer value out of range "
+- "%016lx (%d bits)", (yyvsp[(1) - (2)].array).bits);
++ if (((yyvsp[0].integer) > mask) && (((yyvsp[0].integer) | mask) != -1ULL))
++ ERROR(&(yylsp[0]), "Value out of range for"
++ " %d-bit array element", (yyvsp[-1].array).bits);
+ }
+
+- (yyval.array).data = data_append_integer((yyvsp[(1) - (2)].array).data, (yyvsp[(2) - (2)].integer), (yyvsp[(1) - (2)].array).bits);
++ (yyval.array).data = data_append_integer((yyvsp[-1].array).data, (yyvsp[0].integer), (yyvsp[-1].array).bits);
+ }
++#line 1779 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 31:
+-/* Line 1787 of yacc.c */
+-#line 316 "dtc-parser.y"
++ case 33:
++#line 328 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- uint64_t val = ~0ULL >> (64 - (yyvsp[(1) - (2)].array).bits);
++ uint64_t val = ~0ULL >> (64 - (yyvsp[-1].array).bits);
+
+- if ((yyvsp[(1) - (2)].array).bits == 32)
+- (yyvsp[(1) - (2)].array).data = data_add_marker((yyvsp[(1) - (2)].array).data,
++ if ((yyvsp[-1].array).bits == 32)
++ (yyvsp[-1].array).data = data_add_marker((yyvsp[-1].array).data,
+ REF_PHANDLE,
+- (yyvsp[(2) - (2)].labelref));
++ (yyvsp[0].labelref));
+ else
+- print_error("References are only allowed in "
++ ERROR(&(yylsp[0]), "References are only allowed in "
+ "arrays with 32-bit elements.");
+
+- (yyval.array).data = data_append_integer((yyvsp[(1) - (2)].array).data, val, (yyvsp[(1) - (2)].array).bits);
+- }
+- break;
+-
+- case 32:
+-/* Line 1787 of yacc.c */
+-#line 330 "dtc-parser.y"
+- {
+- (yyval.array).data = data_add_marker((yyvsp[(1) - (2)].array).data, LABEL, (yyvsp[(2) - (2)].labelref));
+- }
+- break;
+-
+- case 33:
+-/* Line 1787 of yacc.c */
+-#line 337 "dtc-parser.y"
+- {
+- (yyval.integer) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);
++ (yyval.array).data = data_append_integer((yyvsp[-1].array).data, val, (yyvsp[-1].array).bits);
+ }
++#line 1797 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 34:
+-/* Line 1787 of yacc.c */
+-#line 341 "dtc-parser.y"
++#line 342 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.integer) = eval_char_literal((yyvsp[(1) - (1)].literal));
++ (yyval.array).data = data_add_marker((yyvsp[-1].array).data, LABEL, (yyvsp[0].labelref));
+ }
++#line 1805 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 35:
+-/* Line 1787 of yacc.c */
+-#line 345 "dtc-parser.y"
++ case 37:
++#line 351 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.integer) = (yyvsp[(2) - (3)].integer);
++ (yyval.integer) = (yyvsp[-1].integer);
+ }
+- break;
+-
+- case 38:
+-/* Line 1787 of yacc.c */
+-#line 356 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (5)].integer) ? (yyvsp[(3) - (5)].integer) : (yyvsp[(5) - (5)].integer); }
++#line 1813 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 40:
+-/* Line 1787 of yacc.c */
+-#line 361 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) || (yyvsp[(3) - (3)].integer); }
++#line 362 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-4].integer) ? (yyvsp[-2].integer) : (yyvsp[0].integer); }
++#line 1819 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 42:
+-/* Line 1787 of yacc.c */
+-#line 366 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) && (yyvsp[(3) - (3)].integer); }
++#line 367 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) || (yyvsp[0].integer); }
++#line 1825 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 44:
+-/* Line 1787 of yacc.c */
+-#line 371 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) | (yyvsp[(3) - (3)].integer); }
++#line 372 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) && (yyvsp[0].integer); }
++#line 1831 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 46:
+-/* Line 1787 of yacc.c */
+-#line 376 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) ^ (yyvsp[(3) - (3)].integer); }
++#line 377 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) | (yyvsp[0].integer); }
++#line 1837 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 48:
+-/* Line 1787 of yacc.c */
+-#line 381 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) & (yyvsp[(3) - (3)].integer); }
++#line 382 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) ^ (yyvsp[0].integer); }
++#line 1843 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 50:
+-/* Line 1787 of yacc.c */
+-#line 386 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) == (yyvsp[(3) - (3)].integer); }
++#line 387 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) & (yyvsp[0].integer); }
++#line 1849 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 51:
+-/* Line 1787 of yacc.c */
+-#line 387 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) != (yyvsp[(3) - (3)].integer); }
++ case 52:
++#line 392 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) == (yyvsp[0].integer); }
++#line 1855 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 53:
+-/* Line 1787 of yacc.c */
+-#line 392 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) < (yyvsp[(3) - (3)].integer); }
+- break;
+-
+- case 54:
+-/* Line 1787 of yacc.c */
+-#line 393 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) > (yyvsp[(3) - (3)].integer); }
++#line 393 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) != (yyvsp[0].integer); }
++#line 1861 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 55:
+-/* Line 1787 of yacc.c */
+-#line 394 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) <= (yyvsp[(3) - (3)].integer); }
++#line 398 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) < (yyvsp[0].integer); }
++#line 1867 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 56:
+-/* Line 1787 of yacc.c */
+-#line 395 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) >= (yyvsp[(3) - (3)].integer); }
++#line 399 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) > (yyvsp[0].integer); }
++#line 1873 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 57:
+-/* Line 1787 of yacc.c */
+-#line 399 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) << (yyvsp[(3) - (3)].integer); }
++#line 400 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) <= (yyvsp[0].integer); }
++#line 1879 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 58:
+-/* Line 1787 of yacc.c */
+-#line 400 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) >> (yyvsp[(3) - (3)].integer); }
++#line 401 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) >= (yyvsp[0].integer); }
++#line 1885 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 60:
+-/* Line 1787 of yacc.c */
+-#line 405 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) + (yyvsp[(3) - (3)].integer); }
++ case 59:
++#line 405 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) << (yyvsp[0].integer); }
++#line 1891 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 61:
+-/* Line 1787 of yacc.c */
+-#line 406 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) - (yyvsp[(3) - (3)].integer); }
++ case 60:
++#line 406 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) >> (yyvsp[0].integer); }
++#line 1897 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 63:
+-/* Line 1787 of yacc.c */
+-#line 411 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) * (yyvsp[(3) - (3)].integer); }
++ case 62:
++#line 411 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) + (yyvsp[0].integer); }
++#line 1903 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 64:
+-/* Line 1787 of yacc.c */
+-#line 412 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) / (yyvsp[(3) - (3)].integer); }
++ case 63:
++#line 412 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) - (yyvsp[0].integer); }
++#line 1909 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 65:
+-/* Line 1787 of yacc.c */
+-#line 413 "dtc-parser.y"
+- { (yyval.integer) = (yyvsp[(1) - (3)].integer) % (yyvsp[(3) - (3)].integer); }
++#line 417 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) * (yyvsp[0].integer); }
++#line 1915 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 68:
+-/* Line 1787 of yacc.c */
+-#line 419 "dtc-parser.y"
+- { (yyval.integer) = -(yyvsp[(2) - (2)].integer); }
++ case 66:
++#line 418 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer); }
++#line 1921 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+- case 69:
+-/* Line 1787 of yacc.c */
+-#line 420 "dtc-parser.y"
+- { (yyval.integer) = ~(yyvsp[(2) - (2)].integer); }
++ case 67:
++#line 419 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer); }
++#line 1927 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 70:
+-/* Line 1787 of yacc.c */
+-#line 421 "dtc-parser.y"
+- { (yyval.integer) = !(yyvsp[(2) - (2)].integer); }
++#line 425 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = -(yyvsp[0].integer); }
++#line 1933 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 71:
+-/* Line 1787 of yacc.c */
+-#line 426 "dtc-parser.y"
+- {
+- (yyval.data) = empty_data;
+- }
++#line 426 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = ~(yyvsp[0].integer); }
++#line 1939 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 72:
+-/* Line 1787 of yacc.c */
+-#line 430 "dtc-parser.y"
+- {
+- (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte));
+- }
++#line 427 "dtc-parser.y" /* yacc.c:1646 */
++ { (yyval.integer) = !(yyvsp[0].integer); }
++#line 1945 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 73:
+-/* Line 1787 of yacc.c */
+-#line 434 "dtc-parser.y"
++#line 432 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
++ (yyval.data) = empty_data;
+ }
++#line 1953 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 74:
+-/* Line 1787 of yacc.c */
+-#line 441 "dtc-parser.y"
++#line 436 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.nodelist) = NULL;
++ (yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte));
+ }
++#line 1961 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 75:
+-/* Line 1787 of yacc.c */
+-#line 445 "dtc-parser.y"
++#line 440 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist));
++ (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
+ }
++#line 1969 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 76:
+-/* Line 1787 of yacc.c */
+-#line 449 "dtc-parser.y"
++#line 447 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- print_error("syntax error: properties must precede subnodes");
+- YYERROR;
++ (yyval.nodelist) = NULL;
+ }
++#line 1977 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 77:
+-/* Line 1787 of yacc.c */
+-#line 457 "dtc-parser.y"
++#line 451 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.node) = name_node((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].propnodename));
++ (yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist));
+ }
++#line 1985 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 78:
+-/* Line 1787 of yacc.c */
+-#line 461 "dtc-parser.y"
++#line 455 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- (yyval.node) = name_node(build_node_delete(), (yyvsp[(2) - (3)].propnodename));
++ ERROR(&(yylsp[0]), "Properties must precede subnodes");
++ YYERROR;
+ }
++#line 1994 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
+ case 79:
+-/* Line 1787 of yacc.c */
+-#line 465 "dtc-parser.y"
++#line 463 "dtc-parser.y" /* yacc.c:1646 */
+ {
+- add_label(&(yyvsp[(2) - (2)].node)->labels, (yyvsp[(1) - (2)].labelref));
+- (yyval.node) = (yyvsp[(2) - (2)].node);
++ (yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename));
+ }
++#line 2002 "dtc-parser.tab.c" /* yacc.c:1646 */
+ break;
+
++ case 80:
++#line 467 "dtc-parser.y" /* yacc.c:1646 */
++ {
++ (yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename));
++ }
++#line 2010 "dtc-parser.tab.c" /* yacc.c:1646 */
++ break;
++
++ case 81:
++#line 471 "dtc-parser.y" /* yacc.c:1646 */
++ {
++ add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref));
++ (yyval.node) = (yyvsp[0].node);
++ }
++#line 2019 "dtc-parser.tab.c" /* yacc.c:1646 */
++ break;
+
+-/* Line 1787 of yacc.c */
+-#line 2073 "dtc-parser.tab.c"
++
++#line 2023 "dtc-parser.tab.c" /* yacc.c:1646 */
+ default: break;
+ }
+ /* User semantic actions sometimes alter yychar, and that requires
+@@ -2090,8 +2040,9 @@
+ YY_STACK_PRINT (yyss, yyssp);
+
+ *++yyvsp = yyval;
++ *++yylsp = yyloc;
+
+- /* Now `shift' the result of the reduction. Determine what state
++ /* Now 'shift' the result of the reduction. Determine what state
+ that goes to, based on the state we popped back to and the rule
+ number reduced by. */
+
+@@ -2106,9 +2057,9 @@
+ goto yynewstate;
+
+
+-/*------------------------------------.
+-| yyerrlab -- here on detecting error |
+-`------------------------------------*/
++/*--------------------------------------.
++| yyerrlab -- here on detecting error. |
++`--------------------------------------*/
+ yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+@@ -2154,25 +2105,25 @@
+ #endif
+ }
+
+-
++ yyerror_range[1] = yylloc;
+
+ if (yyerrstatus == 3)
+ {
+ /* If just tried and failed to reuse lookahead token after an
+- error, discard it. */
++ error, discard it. */
+
+ if (yychar <= YYEOF)
+- {
+- /* Return failure if at end of input. */
+- if (yychar == YYEOF)
+- YYABORT;
+- }
++ {
++ /* Return failure if at end of input. */
++ if (yychar == YYEOF)
++ YYABORT;
++ }
+ else
+- {
+- yydestruct ("Error: discarding",
+- yytoken, &yylval);
+- yychar = YYEMPTY;
+- }
++ {
++ yydestruct ("Error: discarding",
++ yytoken, &yylval, &yylloc);
++ yychar = YYEMPTY;
++ }
+ }
+
+ /* Else will try to reuse lookahead token after shifting the error
+@@ -2191,7 +2142,8 @@
+ if (/*CONSTCOND*/ 0)
+ goto yyerrorlab;
+
+- /* Do not reclaim the symbols of the rule which action triggered
++ yyerror_range[1] = yylsp[1-yylen];
++ /* Do not reclaim the symbols of the rule whose action triggered
+ this YYERROR. */
+ YYPOPSTACK (yylen);
+ yylen = 0;
+@@ -2204,29 +2156,29 @@
+ | yyerrlab1 -- common code for both syntax error and YYERROR. |
+ `-------------------------------------------------------------*/
+ yyerrlab1:
+- yyerrstatus = 3; /* Each real token shifted decrements this. */
++ yyerrstatus = 3; /* Each real token shifted decrements this. */
+
+ for (;;)
+ {
+ yyn = yypact[yystate];
+ if (!yypact_value_is_default (yyn))
+- {
+- yyn += YYTERROR;
+- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+- {
+- yyn = yytable[yyn];
+- if (0 < yyn)
+- break;
+- }
+- }
++ {
++ yyn += YYTERROR;
++ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
++ {
++ yyn = yytable[yyn];
++ if (0 < yyn)
++ break;
++ }
++ }
+
+ /* Pop the current state because it cannot handle the error token. */
+ if (yyssp == yyss)
+- YYABORT;
+-
++ YYABORT;
+
++ yyerror_range[1] = *yylsp;
+ yydestruct ("Error: popping",
+- yystos[yystate], yyvsp);
++ yystos[yystate], yyvsp, yylsp);
+ YYPOPSTACK (1);
+ yystate = *yyssp;
+ YY_STACK_PRINT (yyss, yyssp);
+@@ -2236,6 +2188,11 @@
+ *++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
+
++ yyerror_range[2] = yylloc;
++ /* Using YYLLOC is tempting, but would change the location of
++ the lookahead. YYLOC is available though. */
++ YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
++ *++yylsp = yyloc;
+
+ /* Shift the error token. */
+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+@@ -2275,16 +2232,16 @@
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+- yytoken, &yylval);
++ yytoken, &yylval, &yylloc);
+ }
+- /* Do not reclaim the symbols of the rule which action triggered
++ /* Do not reclaim the symbols of the rule whose action triggered
+ this YYABORT or YYACCEPT. */
+ YYPOPSTACK (yylen);
+ YY_STACK_PRINT (yyss, yyssp);
+ while (yyssp != yyss)
+ {
+ yydestruct ("Cleanup: popping",
+- yystos[*yyssp], yyvsp);
++ yystos[*yyssp], yyvsp, yylsp);
+ YYPOPSTACK (1);
+ }
+ #ifndef yyoverflow
+@@ -2295,72 +2252,12 @@
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ #endif
+- /* Make sure YYID is used. */
+- return YYID (yyresult);
++ return yyresult;
+ }
++#line 477 "dtc-parser.y" /* yacc.c:1906 */
+
+
+-/* Line 2050 of yacc.c */
+-#line 471 "dtc-parser.y"
+-
+-
+-void print_error(char const *fmt, ...)
++void yyerror(char const *s)
+ {
+- va_list va;
+-
+- va_start(va, fmt);
+- srcpos_verror(&yylloc, fmt, va);
+- va_end(va);
+-
+- treesource_error = 1;
+-}
+-
+-void yyerror(char const *s) {
+- print_error("%s", s);
+-}
+-
+-static unsigned long long eval_literal(const char *s, int base, int bits)
+-{
+- unsigned long long val;
+- char *e;
+-
+- errno = 0;
+- val = strtoull(s, &e, base);
+- if (*e) {
+- size_t uls = strspn(e, "UL");
+- if (e[uls])
+- print_error("bad characters in literal");
+- }
+- if ((errno == ERANGE)
+- || ((bits < 64) && (val >= (1ULL << bits))))
+- print_error("literal out of range");
+- else if (errno != 0)
+- print_error("bad literal");
+- return val;
+-}
+-
+-static unsigned char eval_char_literal(const char *s)
+-{
+- int i = 1;
+- char c = s[0];
+-
+- if (c == '\0')
+- {
+- print_error("empty character literal");
+- return 0;
+- }
+-
+- /*
+- * If the first character in the character literal is a \ then process
+- * the remaining characters as an escape encoding. If the first
+- * character is neither an escape or a terminator it should be the only
+- * character in the literal and will be returned.
+- */
+- if (c == '\\')
+- c = get_escape_char(s, &i);
+-
+- if (s[i] != '\0')
+- print_error("malformed character literal");
+-
+- return c;
++ ERROR(&yylloc, "%s", s);
+ }
+diff -Nur linux-3.18.5/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped
+--- linux-3.18.5/scripts/dtc/dtc-parser.tab.h_shipped 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped 2015-02-02 09:28:05.514056445 +0100
+@@ -1,19 +1,19 @@
+-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
++/* A Bison parser, made by GNU Bison 3.0.2. */
+
+ /* Bison interface for Yacc-like parsers in C
+-
+- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+-
++
++ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
++
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+-
++
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+-
++
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+@@ -26,13 +26,13 @@
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+-
++
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+ #ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED
+ # define YY_YY_DTC_PARSER_TAB_H_INCLUDED
+-/* Enabling traces. */
++/* Debug traces. */
+ #ifndef YYDEBUG
+ # define YYDEBUG 0
+ #endif
+@@ -40,48 +40,45 @@
+ extern int yydebug;
+ #endif
+
+-/* Tokens. */
++/* Token type. */
+ #ifndef YYTOKENTYPE
+ # define YYTOKENTYPE
+- /* Put the tokens into the symbol table, so that GDB and other debuggers
+- know about them. */
+- enum yytokentype {
+- DT_V1 = 258,
+- DT_MEMRESERVE = 259,
+- DT_LSHIFT = 260,
+- DT_RSHIFT = 261,
+- DT_LE = 262,
+- DT_GE = 263,
+- DT_EQ = 264,
+- DT_NE = 265,
+- DT_AND = 266,
+- DT_OR = 267,
+- DT_BITS = 268,
+- DT_DEL_PROP = 269,
+- DT_DEL_NODE = 270,
+- DT_PROPNODENAME = 271,
+- DT_LITERAL = 272,
+- DT_CHAR_LITERAL = 273,
+- DT_BASE = 274,
+- DT_BYTE = 275,
+- DT_STRING = 276,
+- DT_LABEL = 277,
+- DT_REF = 278,
+- DT_INCBIN = 279
+- };
++ enum yytokentype
++ {
++ DT_V1 = 258,
++ DT_PLUGIN = 259,
++ DT_MEMRESERVE = 260,
++ DT_LSHIFT = 261,
++ DT_RSHIFT = 262,
++ DT_LE = 263,
++ DT_GE = 264,
++ DT_EQ = 265,
++ DT_NE = 266,
++ DT_AND = 267,
++ DT_OR = 268,
++ DT_BITS = 269,
++ DT_DEL_PROP = 270,
++ DT_DEL_NODE = 271,
++ DT_PROPNODENAME = 272,
++ DT_LITERAL = 273,
++ DT_CHAR_LITERAL = 274,
++ DT_BYTE = 275,
++ DT_STRING = 276,
++ DT_LABEL = 277,
++ DT_REF = 278,
++ DT_INCBIN = 279
++ };
+ #endif
+
+-
++/* Value type. */
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+-typedef union YYSTYPE
++typedef union YYSTYPE YYSTYPE;
++union YYSTYPE
+ {
+-/* Line 2053 of yacc.c */
+-#line 40 "dtc-parser.y"
++#line 39 "dtc-parser.y" /* yacc.c:1909 */
+
+ char *propnodename;
+- char *literal;
+ char *labelref;
+- unsigned int cbase;
+ uint8_t byte;
+ struct data data;
+
+@@ -96,30 +93,31 @@
+ struct node *nodelist;
+ struct reserve_info *re;
+ uint64_t integer;
++ int is_plugin;
+
+-
+-/* Line 2053 of yacc.c */
+-#line 103 "dtc-parser.tab.h"
+-} YYSTYPE;
++#line 99 "dtc-parser.tab.h" /* yacc.c:1909 */
++};
+ # define YYSTYPE_IS_TRIVIAL 1
+-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+ # define YYSTYPE_IS_DECLARED 1
+ #endif
+
+-extern YYSTYPE yylval;
+-
+-#ifdef YYPARSE_PARAM
+-#if defined __STDC__ || defined __cplusplus
+-int yyparse (void *YYPARSE_PARAM);
+-#else
+-int yyparse ();
++/* Location type. */
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
++typedef struct YYLTYPE YYLTYPE;
++struct YYLTYPE
++{
++ int first_line;
++ int first_column;
++ int last_line;
++ int last_column;
++};
++# define YYLTYPE_IS_DECLARED 1
++# define YYLTYPE_IS_TRIVIAL 1
+ #endif
+-#else /* ! YYPARSE_PARAM */
+-#if defined __STDC__ || defined __cplusplus
++
++
++extern YYSTYPE yylval;
++extern YYLTYPE yylloc;
+ int yyparse (void);
+-#else
+-int yyparse ();
+-#endif
+-#endif /* ! YYPARSE_PARAM */
+
+ #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */
+diff -Nur linux-3.18.5/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser.y
+--- linux-3.18.5/scripts/dtc/dtc-parser.y 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/dtc-parser.y 2015-02-02 09:28:05.514056445 +0100
+@@ -17,31 +17,28 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+-
+ %{
+ #include <stdio.h>
++#include <inttypes.h>
+
+ #include "dtc.h"
+ #include "srcpos.h"
+
+-YYLTYPE yylloc;
+-
+ extern int yylex(void);
+-extern void print_error(char const *fmt, ...);
+ extern void yyerror(char const *s);
++#define ERROR(loc, ...) \
++ do { \
++ srcpos_error((loc), "Error", __VA_ARGS__); \
++ treesource_error = true; \
++ } while (0)
+
+ extern struct boot_info *the_boot_info;
+-extern int treesource_error;
+-
+-static unsigned long long eval_literal(const char *s, int base, int bits);
+-static unsigned char eval_char_literal(const char *s);
++extern bool treesource_error;
+ %}
+
+ %union {
+ char *propnodename;
+- char *literal;
+ char *labelref;
+- unsigned int cbase;
+ uint8_t byte;
+ struct data data;
+
+@@ -56,18 +53,19 @@
+ struct node *nodelist;
+ struct reserve_info *re;
+ uint64_t integer;
++ int is_plugin;
+ }
+
+ %token DT_V1
++%token DT_PLUGIN
+ %token DT_MEMRESERVE
+ %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR
+ %token DT_BITS
+ %token DT_DEL_PROP
+ %token DT_DEL_NODE
+ %token <propnodename> DT_PROPNODENAME
+-%token <literal> DT_LITERAL
+-%token <literal> DT_CHAR_LITERAL
+-%token <cbase> DT_BASE
++%token <integer> DT_LITERAL
++%token <integer> DT_CHAR_LITERAL
+ %token <byte> DT_BYTE
+ %token <data> DT_STRING
+ %token <labelref> DT_LABEL
+@@ -76,6 +74,7 @@
+
+ %type <data> propdata
+ %type <data> propdataprefix
++%type <is_plugin> plugindecl
+ %type <re> memreserve
+ %type <re> memreserves
+ %type <array> arrayprefix
+@@ -106,10 +105,23 @@
+ %%
+
+ sourcefile:
+- DT_V1 ';' memreserves devicetree
++ DT_V1 ';' plugindecl memreserves devicetree
++ {
++ $5->is_plugin = $3;
++ $5->is_root = 1;
++ the_boot_info = build_boot_info($4, $5,
++ guess_boot_cpuid($5));
++ }
++ ;
++
++plugindecl:
++ /* empty */
++ {
++ $$ = 0;
++ }
++ | DT_PLUGIN ';'
+ {
+- the_boot_info = build_boot_info($3, $4,
+- guess_boot_cpuid($4));
++ $$ = 1;
+ }
+ ;
+
+@@ -152,17 +164,18 @@
+ if (target)
+ merge_nodes(target, $3);
+ else
+- print_error("label or path, '%s', not found", $2);
++ ERROR(&@2, "Label or path %s not found", $2);
+ $$ = $1;
+ }
+ | devicetree DT_DEL_NODE DT_REF ';'
+ {
+ struct node *target = get_node_by_ref($1, $3);
+
+- if (!target)
+- print_error("label or path, '%s', not found", $3);
+- else
++ if (target)
+ delete_node(target);
++ else
++ ERROR(&@3, "Label or path %s not found", $3);
++
+
+ $$ = $1;
+ }
+@@ -230,10 +243,9 @@
+
+ if ($6 != 0)
+ if (fseek(f, $6, SEEK_SET) != 0)
+- print_error("Couldn't seek to offset %llu in \"%s\": %s",
+- (unsigned long long)$6,
+- $4.val,
+- strerror(errno));
++ die("Couldn't seek to offset %llu in \"%s\": %s",
++ (unsigned long long)$6, $4.val,
++ strerror(errno));
+
+ d = data_copy_file(f, $8);
+
+@@ -274,18 +286,19 @@
+ arrayprefix:
+ DT_BITS DT_LITERAL '<'
+ {
+- $$.data = empty_data;
+- $$.bits = eval_literal($2, 0, 7);
++ unsigned long long bits;
+
+- if (($$.bits != 8) &&
+- ($$.bits != 16) &&
+- ($$.bits != 32) &&
+- ($$.bits != 64))
+- {
+- print_error("Only 8, 16, 32 and 64-bit elements"
+- " are currently supported");
+- $$.bits = 32;
++ bits = $2;
++
++ if ((bits != 8) && (bits != 16) &&
++ (bits != 32) && (bits != 64)) {
++ ERROR(&@2, "Array elements must be"
++ " 8, 16, 32 or 64-bits");
++ bits = 32;
+ }
++
++ $$.data = empty_data;
++ $$.bits = bits;
+ }
+ | '<'
+ {
+@@ -305,9 +318,8 @@
+ * mask), all bits are one.
+ */
+ if (($2 > mask) && (($2 | mask) != -1ULL))
+- print_error(
+- "integer value out of range "
+- "%016lx (%d bits)", $1.bits);
++ ERROR(&@2, "Value out of range for"
++ " %d-bit array element", $1.bits);
+ }
+
+ $$.data = data_append_integer($1.data, $2, $1.bits);
+@@ -321,7 +333,7 @@
+ REF_PHANDLE,
+ $2);
+ else
+- print_error("References are only allowed in "
++ ERROR(&@2, "References are only allowed in "
+ "arrays with 32-bit elements.");
+
+ $$.data = data_append_integer($1.data, val, $1.bits);
+@@ -334,13 +346,7 @@
+
+ integer_prim:
+ DT_LITERAL
+- {
+- $$ = eval_literal($1, 0, 64);
+- }
+ | DT_CHAR_LITERAL
+- {
+- $$ = eval_char_literal($1);
+- }
+ | '(' integer_expr ')'
+ {
+ $$ = $2;
+@@ -447,7 +453,7 @@
+ }
+ | subnode propdef
+ {
+- print_error("syntax error: properties must precede subnodes");
++ ERROR(&@2, "Properties must precede subnodes");
+ YYERROR;
+ }
+ ;
+@@ -470,63 +476,7 @@
+
+ %%
+
+-void print_error(char const *fmt, ...)
++void yyerror(char const *s)
+ {
+- va_list va;
+-
+- va_start(va, fmt);
+- srcpos_verror(&yylloc, fmt, va);
+- va_end(va);
+-
+- treesource_error = 1;
+-}
+-
+-void yyerror(char const *s) {
+- print_error("%s", s);
+-}
+-
+-static unsigned long long eval_literal(const char *s, int base, int bits)
+-{
+- unsigned long long val;
+- char *e;
+-
+- errno = 0;
+- val = strtoull(s, &e, base);
+- if (*e) {
+- size_t uls = strspn(e, "UL");
+- if (e[uls])
+- print_error("bad characters in literal");
+- }
+- if ((errno == ERANGE)
+- || ((bits < 64) && (val >= (1ULL << bits))))
+- print_error("literal out of range");
+- else if (errno != 0)
+- print_error("bad literal");
+- return val;
+-}
+-
+-static unsigned char eval_char_literal(const char *s)
+-{
+- int i = 1;
+- char c = s[0];
+-
+- if (c == '\0')
+- {
+- print_error("empty character literal");
+- return 0;
+- }
+-
+- /*
+- * If the first character in the character literal is a \ then process
+- * the remaining characters as an escape encoding. If the first
+- * character is neither an escape or a terminator it should be the only
+- * character in the literal and will be returned.
+- */
+- if (c == '\\')
+- c = get_escape_char(s, &i);
+-
+- if (s[i] != '\0')
+- print_error("malformed character literal");
+-
+- return c;
++ ERROR(&yylloc, "%s", s);
+ }
+diff -Nur linux-3.18.5/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c
+--- linux-3.18.5/scripts/dtc/flattree.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/flattree.c 2015-02-02 09:28:05.514056445 +0100
+@@ -261,7 +261,13 @@
+ {
+ struct property *prop;
+ struct node *child;
+- int seen_name_prop = 0;
++ bool seen_name_prop = false;
++ struct symbol *sym;
++ struct fixup *f;
++ struct fixup_entry *fe;
++ char *name, *s;
++ const char *fullpath;
++ int namesz, nameoff, vallen;
+
+ if (tree->deleted)
+ return;
+@@ -276,10 +282,8 @@
+ emit->align(etarget, sizeof(cell_t));
+
+ for_each_property(tree, prop) {
+- int nameoff;
+-
+ if (streq(prop->name, "name"))
+- seen_name_prop = 1;
++ seen_name_prop = true;
+
+ nameoff = stringtable_insert(strbuf, prop->name);
+
+@@ -310,6 +314,139 @@
+ flatten_tree(child, emit, etarget, strbuf, vi);
+ }
+
++ if (!symbol_fixup_support)
++ goto no_symbols;
++
++ /* add the symbol nodes (if any) */
++ if (tree->symbols) {
++
++ emit->beginnode(etarget, NULL);
++ emit->string(etarget, "__symbols__", 0);
++ emit->align(etarget, sizeof(cell_t));
++
++ for_each_symbol(tree, sym) {
++
++ vallen = strlen(sym->node->fullpath);
++
++ nameoff = stringtable_insert(strbuf, sym->label->label);
++
++ emit->property(etarget, NULL);
++ emit->cell(etarget, vallen + 1);
++ emit->cell(etarget, nameoff);
++
++ if ((vi->flags & FTF_VARALIGN) && vallen >= 8)
++ emit->align(etarget, 8);
++
++ emit->string(etarget, sym->node->fullpath,
++ strlen(sym->node->fullpath));
++ emit->align(etarget, sizeof(cell_t));
++ }
++
++ emit->endnode(etarget, NULL);
++ }
++
++ /* add the fixup nodes */
++ if (tree->fixups) {
++
++ /* emit the external fixups */
++ emit->beginnode(etarget, NULL);
++ emit->string(etarget, "__fixups__", 0);
++ emit->align(etarget, sizeof(cell_t));
++
++ for_each_fixup(tree, f) {
++
++ namesz = 0;
++ for_each_fixup_entry(f, fe) {
++ fullpath = fe->node->fullpath;
++ if (fullpath[0] == '\0')
++ fullpath = "/";
++ namesz += strlen(fullpath) + 1;
++ namesz += strlen(fe->prop->name) + 1;
++ namesz += 32; /* space for :<number> + '\0' */
++ }
++
++ name = xmalloc(namesz);
++
++ s = name;
++ for_each_fixup_entry(f, fe) {
++ fullpath = fe->node->fullpath;
++ if (fullpath[0] == '\0')
++ fullpath = "/";
++ snprintf(s, name + namesz - s, "%s:%s:%d",
++ fullpath,
++ fe->prop->name, fe->offset);
++ s += strlen(s) + 1;
++ }
++
++ nameoff = stringtable_insert(strbuf, f->ref);
++ vallen = s - name - 1;
++
++ emit->property(etarget, NULL);
++ emit->cell(etarget, vallen + 1);
++ emit->cell(etarget, nameoff);
++
++ if ((vi->flags & FTF_VARALIGN) && vallen >= 8)
++ emit->align(etarget, 8);
++
++ emit->string(etarget, name, vallen);
++ emit->align(etarget, sizeof(cell_t));
++
++ free(name);
++ }
++
++ emit->endnode(etarget, tree->labels);
++ }
++
++ /* add the local fixup property */
++ if (tree->local_fixups) {
++
++ /* emit the external fixups */
++ emit->beginnode(etarget, NULL);
++ emit->string(etarget, "__local_fixups__", 0);
++ emit->align(etarget, sizeof(cell_t));
++
++ namesz = 0;
++ for_each_local_fixup_entry(tree, fe) {
++ fullpath = fe->node->fullpath;
++ if (fullpath[0] == '\0')
++ fullpath = "/";
++ namesz += strlen(fullpath) + 1;
++ namesz += strlen(fe->prop->name) + 1;
++ namesz += 32; /* space for :<number> + '\0' */
++ }
++
++ name = xmalloc(namesz);
++
++ s = name;
++ for_each_local_fixup_entry(tree, fe) {
++ fullpath = fe->node->fullpath;
++ if (fullpath[0] == '\0')
++ fullpath = "/";
++ snprintf(s, name + namesz - s, "%s:%s:%d",
++ fullpath, fe->prop->name,
++ fe->offset);
++ s += strlen(s) + 1;
++ }
++
++ nameoff = stringtable_insert(strbuf, "fixup");
++ vallen = s - name - 1;
++
++ emit->property(etarget, NULL);
++ emit->cell(etarget, vallen + 1);
++ emit->cell(etarget, nameoff);
++
++ if ((vi->flags & FTF_VARALIGN) && vallen >= 8)
++ emit->align(etarget, 8);
++
++ emit->string(etarget, name, vallen);
++ emit->align(etarget, sizeof(cell_t));
++
++ free(name);
++
++ emit->endnode(etarget, tree->labels);
++ }
++
++no_symbols:
+ emit->endnode(etarget, tree->labels);
+ }
+
+diff -Nur linux-3.18.5/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c
+--- linux-3.18.5/scripts/dtc/fstree.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/fstree.c 2015-02-02 09:28:05.514056445 +0100
+@@ -37,26 +37,26 @@
+ tree = build_node(NULL, NULL);
+
+ while ((de = readdir(d)) != NULL) {
+- char *tmpnam;
++ char *tmpname;
+
+ if (streq(de->d_name, ".")
+ || streq(de->d_name, ".."))
+ continue;
+
+- tmpnam = join_path(dirname, de->d_name);
++ tmpname = join_path(dirname, de->d_name);
+
+- if (lstat(tmpnam, &st) < 0)
+- die("stat(%s): %s\n", tmpnam, strerror(errno));
++ if (lstat(tmpname, &st) < 0)
++ die("stat(%s): %s\n", tmpname, strerror(errno));
+
+ if (S_ISREG(st.st_mode)) {
+ struct property *prop;
+ FILE *pfile;
+
+- pfile = fopen(tmpnam, "r");
++ pfile = fopen(tmpname, "rb");
+ if (! pfile) {
+ fprintf(stderr,
+ "WARNING: Cannot open %s: %s\n",
+- tmpnam, strerror(errno));
++ tmpname, strerror(errno));
+ } else {
+ prop = build_property(xstrdup(de->d_name),
+ data_copy_file(pfile,
+@@ -67,12 +67,12 @@
+ } else if (S_ISDIR(st.st_mode)) {
+ struct node *newchild;
+
+- newchild = read_fstree(tmpnam);
++ newchild = read_fstree(tmpname);
+ newchild = name_node(newchild, xstrdup(de->d_name));
+ add_child(tree, newchild);
+ }
+
+- free(tmpnam);
++ free(tmpname);
+ }
+
+ closedir(d);
+diff -Nur linux-3.18.5/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c
+--- linux-3.18.5/scripts/dtc/livetree.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/livetree.c 2015-02-02 09:28:05.514056445 +0100
+@@ -511,7 +511,9 @@
+
+ struct node *get_node_by_ref(struct node *tree, const char *ref)
+ {
+- if (ref[0] == '/')
++ if (streq(ref, "/"))
++ return tree;
++ else if (ref[0] == '/')
+ return get_node_by_path(tree, ref);
+ else
+ return get_node_by_label(tree, ref);
+diff -Nur linux-3.18.5/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c
+--- linux-3.18.5/scripts/dtc/srcpos.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/srcpos.c 2015-02-02 09:28:05.514056445 +0100
+@@ -34,7 +34,7 @@
+ static struct search_path *search_path_head, **search_path_tail;
+
+
+-static char *dirname(const char *path)
++static char *get_dirname(const char *path)
+ {
+ const char *slash = strrchr(path, '/');
+
+@@ -77,7 +77,7 @@
+ else
+ fullname = join_path(dirname, fname);
+
+- *fp = fopen(fullname, "r");
++ *fp = fopen(fullname, "rb");
+ if (!*fp) {
+ free(fullname);
+ fullname = NULL;
+@@ -150,7 +150,7 @@
+ srcfile = xmalloc(sizeof(*srcfile));
+
+ srcfile->f = srcfile_relative_open(fname, &srcfile->name);
+- srcfile->dir = dirname(srcfile->name);
++ srcfile->dir = get_dirname(srcfile->name);
+ srcfile->prev = current_srcfile;
+
+ srcfile->lineno = 1;
+@@ -159,7 +159,7 @@
+ current_srcfile = srcfile;
+ }
+
+-int srcfile_pop(void)
++bool srcfile_pop(void)
+ {
+ struct srcfile_state *srcfile = current_srcfile;
+
+@@ -177,7 +177,7 @@
+ * fix this we could either allocate all the files from a
+ * table, or use a pool allocator. */
+
+- return current_srcfile ? 1 : 0;
++ return current_srcfile ? true : false;
+ }
+
+ void srcfile_add_search_path(const char *dirname)
+@@ -290,42 +290,27 @@
+ return pos_str;
+ }
+
+-void
+-srcpos_verror(struct srcpos *pos, char const *fmt, va_list va)
++void srcpos_verror(struct srcpos *pos, const char *prefix,
++ const char *fmt, va_list va)
+ {
+- const char *srcstr;
+-
+- srcstr = srcpos_string(pos);
++ char *srcstr;
+
+- fprintf(stderr, "Error: %s ", srcstr);
+- vfprintf(stderr, fmt, va);
+- fprintf(stderr, "\n");
+-}
++ srcstr = srcpos_string(pos);
+
+-void
+-srcpos_error(struct srcpos *pos, char const *fmt, ...)
+-{
+- va_list va;
++ fprintf(stderr, "%s: %s ", prefix, srcstr);
++ vfprintf(stderr, fmt, va);
++ fprintf(stderr, "\n");
+
+- va_start(va, fmt);
+- srcpos_verror(pos, fmt, va);
+- va_end(va);
++ free(srcstr);
+ }
+
+-
+-void
+-srcpos_warn(struct srcpos *pos, char const *fmt, ...)
++void srcpos_error(struct srcpos *pos, const char *prefix,
++ const char *fmt, ...)
+ {
+- const char *srcstr;
+ va_list va;
+- va_start(va, fmt);
+-
+- srcstr = srcpos_string(pos);
+-
+- fprintf(stderr, "Warning: %s ", srcstr);
+- vfprintf(stderr, fmt, va);
+- fprintf(stderr, "\n");
+
++ va_start(va, fmt);
++ srcpos_verror(pos, prefix, fmt, va);
+ va_end(va);
+ }
+
+diff -Nur linux-3.18.5/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h
+--- linux-3.18.5/scripts/dtc/srcpos.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/srcpos.h 2015-02-02 09:28:05.514056445 +0100
+@@ -21,6 +21,7 @@
+ #define _SRCPOS_H_
+
+ #include <stdio.h>
++#include <stdbool.h>
+
+ struct srcfile_state {
+ FILE *f;
+@@ -55,7 +56,7 @@
+ FILE *srcfile_relative_open(const char *fname, char **fullnamep);
+
+ void srcfile_push(const char *fname);
+-int srcfile_pop(void);
++bool srcfile_pop(void);
+
+ /**
+ * Add a new directory to the search path for input files
+@@ -106,12 +107,12 @@
+ extern char *srcpos_string(struct srcpos *pos);
+ extern void srcpos_dump(struct srcpos *pos);
+
+-extern void srcpos_verror(struct srcpos *pos, char const *, va_list va)
+- __attribute__((format(printf, 2, 0)));
+-extern void srcpos_error(struct srcpos *pos, char const *, ...)
+- __attribute__((format(printf, 2, 3)));
+-extern void srcpos_warn(struct srcpos *pos, char const *, ...)
+- __attribute__((format(printf, 2, 3)));
++extern void srcpos_verror(struct srcpos *pos, const char *prefix,
++ const char *fmt, va_list va)
++ __attribute__((format(printf, 3, 0)));
++extern void srcpos_error(struct srcpos *pos, const char *prefix,
++ const char *fmt, ...)
++ __attribute__((format(printf, 3, 4)));
+
+ extern void srcpos_set_line(char *f, int l);
+
+diff -Nur linux-3.18.5/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource.c
+--- linux-3.18.5/scripts/dtc/treesource.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/treesource.c 2015-02-02 09:28:05.514056445 +0100
+@@ -26,12 +26,12 @@
+ extern YYLTYPE yylloc;
+
+ struct boot_info *the_boot_info;
+-int treesource_error;
++bool treesource_error;
+
+ struct boot_info *dt_from_source(const char *fname)
+ {
+ the_boot_info = NULL;
+- treesource_error = 0;
++ treesource_error = false;
+
+ srcfile_push(fname);
+ yyin = current_srcfile->f;
+@@ -54,9 +54,9 @@
+ fputc('\t', f);
+ }
+
+-static int isstring(char c)
++static bool isstring(char c)
+ {
+- return (isprint(c)
++ return (isprint((unsigned char)c)
+ || (c == '\0')
+ || strchr("\a\b\t\n\v\f\r", c));
+ }
+@@ -109,7 +109,7 @@
+ break;
+ case '\0':
+ fprintf(f, "\", ");
+- while (m && (m->offset < i)) {
++ while (m && (m->offset <= (i + 1))) {
+ if (m->type == LABEL) {
+ assert(m->offset == (i+1));
+ fprintf(f, "%s: ", m->ref);
+@@ -119,7 +119,7 @@
+ fprintf(f, "\"");
+ break;
+ default:
+- if (isprint(c))
++ if (isprint((unsigned char)c))
+ fprintf(f, "%c", c);
+ else
+ fprintf(f, "\\x%02hhx", c);
+@@ -178,7 +178,7 @@
+ m = m->next;
+ }
+
+- fprintf(f, "%02hhx", *bp++);
++ fprintf(f, "%02hhx", (unsigned char)(*bp++));
+ if ((const void *)bp >= propend)
+ break;
+ fprintf(f, " ");
+diff -Nur linux-3.18.5/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c
+--- linux-3.18.5/scripts/dtc/util.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/util.c 2015-02-02 09:28:05.514056445 +0100
+@@ -39,11 +39,11 @@
+ char *xstrdup(const char *s)
+ {
+ int len = strlen(s) + 1;
+- char *dup = xmalloc(len);
++ char *d = xmalloc(len);
+
+- memcpy(dup, s, len);
++ memcpy(d, s, len);
+
+- return dup;
++ return d;
+ }
+
+ char *join_path(const char *path, const char *name)
+@@ -70,7 +70,7 @@
+ return str;
+ }
+
+-int util_is_printable_string(const void *data, int len)
++bool util_is_printable_string(const void *data, int len)
+ {
+ const char *s = data;
+ const char *ss, *se;
+@@ -87,7 +87,7 @@
+
+ while (s < se) {
+ ss = s;
+- while (s < se && *s && isprint(*s))
++ while (s < se && *s && isprint((unsigned char)*s))
+ s++;
+
+ /* not zero, or not done yet */
+@@ -219,10 +219,6 @@
+ if (offset == bufsize) {
+ bufsize *= 2;
+ buf = xrealloc(buf, bufsize);
+- if (!buf) {
+- ret = ENOMEM;
+- break;
+- }
+ }
+
+ ret = read(fd, &buf[offset], bufsize - offset);
+@@ -375,9 +371,9 @@
+ const uint32_t *cell = (const uint32_t *)data;
+
+ printf(" = <");
+- for (i = 0; i < len; i += 4)
++ for (i = 0, len /= 4; i < len; i++)
+ printf("0x%08x%s", fdt32_to_cpu(cell[i]),
+- i < (len - 4) ? " " : "");
++ i < (len - 1) ? " " : "");
+ printf(">");
+ } else {
+ printf(" = [");
+diff -Nur linux-3.18.5/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h
+--- linux-3.18.5/scripts/dtc/util.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/util.h 2015-02-02 09:28:05.514056445 +0100
+@@ -2,6 +2,7 @@
+ #define _UTIL_H
+
+ #include <stdarg.h>
++#include <stdbool.h>
+ #include <getopt.h>
+
+ /*
+@@ -33,6 +34,7 @@
+ va_start(ap, str);
+ fprintf(stderr, "FATAL ERROR: ");
+ vfprintf(stderr, str, ap);
++ va_end(ap);
+ exit(1);
+ }
+
+@@ -68,7 +70,7 @@
+ * @param len The string length including terminator
+ * @return 1 if a valid printable string, 0 if not
+ */
+-int util_is_printable_string(const void *data, int len);
++bool util_is_printable_string(const void *data, int len);
+
+ /*
+ * Parse an escaped character starting at index i in string s. The resulting
+diff -Nur linux-3.18.5/scripts/dtc/version_gen.h linux-rpi/scripts/dtc/version_gen.h
+--- linux-3.18.5/scripts/dtc/version_gen.h 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/scripts/dtc/version_gen.h 2015-02-02 09:28:05.514056445 +0100
+@@ -1 +1 @@
+-#define DTC_VERSION "DTC 1.4.0-dirty"
++#define DTC_VERSION "DTC 1.4.1-g36c70742"
+diff -Nur linux-3.18.5/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c
+--- linux-3.18.5/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835.c 2015-02-02 09:28:05.534056445 +0100
@@ -0,0 +1,420 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -277072,9 +282548,9 @@ diff -Nur linux-3.18.3/sound/arm/bcm2835.c linux-rpi-3.18.x/sound/arm/bcm2835.c
+MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm2835_alsa");
-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
+diff -Nur linux-3.18.5/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c
+--- linux-3.18.5/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-ctl.c 2015-02-02 09:28:05.534056445 +0100
@@ -0,0 +1,323 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -277399,9 +282875,9 @@ diff -Nur linux-3.18.3/sound/arm/bcm2835-ctl.c linux-rpi-3.18.x/sound/arm/bcm283
+ }
+ return 0;
+}
-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
+diff -Nur linux-3.18.5/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h
+--- linux-3.18.5/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835.h 2015-02-02 09:28:05.534056445 +0100
@@ -0,0 +1,167 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -277570,9 +283046,9 @@ diff -Nur linux-3.18.3/sound/arm/bcm2835.h linux-rpi-3.18.x/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.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
+diff -Nur linux-3.18.5/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c
+--- linux-3.18.5/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-pcm.c 2015-02-02 09:28:05.534056445 +0100
@@ -0,0 +1,552 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -278126,9 +283602,9 @@ diff -Nur linux-3.18.3/sound/arm/bcm2835-pcm.c linux-rpi-3.18.x/sound/arm/bcm283
+
+ return 0;
+}
-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
+diff -Nur linux-3.18.5/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c
+--- linux-3.18.5/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/bcm2835-vchiq.c 2015-02-02 09:28:05.534056445 +0100
@@ -0,0 +1,902 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -279032,9 +284508,9 @@ diff -Nur linux-3.18.3/sound/arm/bcm2835-vchiq.c linux-rpi-3.18.x/sound/arm/bcm2
+
+module_param(force_bulk, bool, 0444);
+MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio");
-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
+diff -Nur linux-3.18.5/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig
+--- linux-3.18.5/sound/arm/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/arm/Kconfig 2015-02-02 09:28:05.534056445 +0100
@@ -39,5 +39,12 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
@@ -279048,9 +284524,9 @@ diff -Nur linux-3.18.3/sound/arm/Kconfig linux-rpi-3.18.x/sound/arm/Kconfig
+
endif # SND_ARM
-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
+diff -Nur linux-3.18.5/sound/arm/Makefile linux-rpi/sound/arm/Makefile
+--- linux-3.18.5/sound/arm/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/arm/Makefile 2015-02-02 09:28:05.534056445 +0100
@@ -14,3 +14,8 @@
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
@@ -279060,9 +284536,9 @@ diff -Nur linux-3.18.3/sound/arm/Makefile linux-rpi-3.18.x/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.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
+diff -Nur linux-3.18.5/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h
+--- linux-3.18.5/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2015-02-02 09:28:05.538056445 +0100
@@ -0,0 +1,116 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -279180,9 +284656,9 @@ diff -Nur linux-3.18.3/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.18.x/sound
+} VC_AUDIO_MSG_T;
+
+#endif // _VC_AUDIO_DEFS_H_
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c
+--- linux-3.18.5/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,1009 @@
+/*
+ * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC
@@ -280193,9 +285669,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/bcm2708-i2s.c linux-rpi-3.18.x/sound/soc/bc
+MODULE_DESCRIPTION("BCM2708 I2S interface");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm2708-i2s.h
+--- linux-3.18.5/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/bcm2708-i2s.h 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,35 @@
+/*
+ * I2S configuration for sound cards.
@@ -280232,9 +285708,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/bcm2708-i2s.h linux-rpi-3.18.x/sound/soc/bc
+extern void bcm2708_i2s_set_gpio(int gpio);
+
+#endif
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm2835-i2s.c
+--- linux-3.18.5/sound/soc/bcm/bcm2835-i2s.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/bcm/bcm2835-i2s.c 2015-02-02 09:28:05.606056446 +0100
@@ -861,6 +861,7 @@
{ .compatible = "brcm,bcm2835-i2s", },
{},
@@ -280243,9 +285719,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/bcm2835-i2s.c linux-rpi-3.18.x/sound/soc/bc
static struct platform_driver bcm2835_i2s_driver = {
.probe = bcm2835_i2s_probe,
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hifiberry_amp.c
+--- linux-3.18.5/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_amp.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,106 @@
+/*
+ * ASoC Driver for HifiBerry AMP
@@ -280353,9 +285829,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_amp.c linux-rpi-3.18.x/sound/soc/
+MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>");
+MODULE_DESCRIPTION("ASoC driver for HiFiBerry-AMP");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c
+--- linux-3.18.5/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,122 @@
+/*
+ * ASoC Driver for HifiBerry DAC
@@ -280479,9 +285955,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_dac.c linux-rpi-3.18.x/sound/soc/
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm/hifiberry_dacplus.c
+--- linux-3.18.5/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_dacplus.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,141 @@
+/*
+ * ASoC Driver for HiFiBerry DAC+
@@ -280624,10 +286100,10 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_dacplus.c linux-rpi-3.18.x/sound/
+MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+");
+MODULE_LICENSE("GPL v2");
-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 @@
+diff -Nur linux-3.18.5/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c
+--- linux-3.18.5/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2015-02-02 09:28:05.606056446 +0100
+@@ -0,0 +1,202 @@
+/*
+ * ASoC Driver for HifiBerry Digi
+ *
@@ -280656,6 +286132,11 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc
+
+#include "../codecs/wm8804.h"
+
++static short int auto_shutdown_output = 0;
++module_param(auto_shutdown_output, short, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
++MODULE_PARM_DESC(auto_shutdown_output, "Shutdown SP/DIF output if playback is stopped");
++
++
+static int samplerate=44100;
+
+static int snd_rpi_hifiberry_digi_init(struct snd_soc_pcm_runtime *rtd)
@@ -280668,6 +286149,25 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc
+ return 0;
+}
+
++static int snd_rpi_hifiberry_digi_startup(struct snd_pcm_substream *substream) {
++ /* turn on digital output */
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec *codec = rtd->codec;
++ snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x00);
++ return 0;
++}
++
++static void snd_rpi_hifiberry_digi_shutdown(struct snd_pcm_substream *substream) {
++ /* turn off output */
++ if (auto_shutdown_output) {
++ /* turn off output */
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec *codec = rtd->codec;
++ snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x3c);
++ }
++}
++
++
+static int snd_rpi_hifiberry_digi_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
@@ -280700,7 +286200,8 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc
+ break;
+ default:
+ dev_err(substream->pcm->dev,
-+ "Failed to set WM8804 SYSCLK, unsupported samplerate\n");
++ "Failed to set WM8804 SYSCLK, unsupported samplerate %d\n",
++ samplerate);
+ }
+
+ snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div);
@@ -280726,6 +286227,8 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc
+/* machine stream operations */
+static struct snd_soc_ops snd_rpi_hifiberry_digi_ops = {
+ .hw_params = snd_rpi_hifiberry_digi_hw_params,
++ .startup = snd_rpi_hifiberry_digi_startup,
++ .shutdown = snd_rpi_hifiberry_digi_shutdown,
+};
+
+static struct snd_soc_dai_link snd_rpi_hifiberry_digi_dai[] = {
@@ -280803,9 +286306,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/hifiberry_digi.c linux-rpi-3.18.x/sound/soc
+MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c
+--- linux-3.18.5/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,127 @@
+/*
+ * ASoC Driver for IQaudIO DAC
@@ -280934,9 +286437,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/iqaudio-dac.c linux-rpi-3.18.x/sound/soc/bc
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig
+--- linux-3.18.5/sound/soc/bcm/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/bcm/Kconfig 2015-02-02 09:28:05.606056446 +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
@@ -280994,9 +286497,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/Kconfig linux-rpi-3.18.x/sound/soc/bcm/Kcon
+ select SND_SOC_PCM512x_I2C
+ help
+ Say Y or M if you want to add support for IQaudIO-DAC.
-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
+diff -Nur linux-3.18.5/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile
+--- linux-3.18.5/sound/soc/bcm/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/bcm/Makefile 2015-02-02 09:28:05.606056446 +0100
@@ -3,3 +3,22 @@
obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o
@@ -281020,9 +286523,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/Makefile linux-rpi-3.18.x/sound/soc/bcm/Mak
+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.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
+diff -Nur linux-3.18.5/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c
+--- linux-3.18.5/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/bcm/rpi-dac.c 2015-02-02 09:28:05.606056446 +0100
@@ -0,0 +1,97 @@
+/*
+ * ASoC Driver for RPi-DAC.
@@ -281121,9 +286624,9 @@ diff -Nur linux-3.18.3/sound/soc/bcm/rpi-dac.c linux-rpi-3.18.x/sound/soc/bcm/rp
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for RPi-DAC");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig
+--- linux-3.18.5/sound/soc/codecs/Kconfig 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/codecs/Kconfig 2015-02-02 09:28:05.610056446 +0100
@@ -80,6 +80,8 @@
select SND_SOC_PCM512x_I2C if I2C
select SND_SOC_PCM512x_SPI if SPI_MASTER
@@ -281164,9 +286667,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/Kconfig linux-rpi-3.18.x/sound/soc/codec
config SND_SOC_TLV320AIC23
tristate
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile
+--- linux-3.18.5/sound/soc/codecs/Makefile 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/codecs/Makefile 2015-02-02 09:28:05.610056446 +0100
@@ -74,6 +74,8 @@
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-rl6231-objs := rl6231.o
@@ -281201,9 +286704,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/Makefile linux-rpi-3.18.x/sound/soc/code
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.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
+diff -Nur linux-3.18.5/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c
+--- linux-3.18.5/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm1794a.c 2015-02-02 09:28:05.618056446 +0100
@@ -0,0 +1,62 @@
+/*
+ * Driver for the PCM1794A codec
@@ -281267,9 +286770,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/pcm1794a.c linux-rpi-3.18.x/sound/soc/co
+MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c
+--- linux-3.18.5/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm5102a.c 2015-02-02 09:28:05.618056446 +0100
@@ -0,0 +1,70 @@
+/*
+ * Driver for the PCM5102A codec
@@ -281341,9 +286844,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/pcm5102a.c linux-rpi-3.18.x/sound/soc/co
+MODULE_DESCRIPTION("ASoC PCM5102A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c
+--- linux-3.18.5/sound/soc/codecs/pcm512x.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/codecs/pcm512x.c 2015-02-02 09:28:05.618056446 +0100
@@ -259,8 +259,8 @@
pcm512x_ramp_step_text);
@@ -281355,10 +286858,10 @@ diff -Nur linux-3.18.3/sound/soc/codecs/pcm512x.c linux-rpi-3.18.x/sound/soc/cod
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.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 @@
+diff -Nur linux-3.18.5/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas5713.c
+--- linux-3.18.5/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/tas5713.c 2015-02-02 09:28:05.622056446 +0100
+@@ -0,0 +1,369 @@
+/*
+ * ASoC Driver for TAS5713
+ *
@@ -281543,33 +287046,40 @@ diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.c linux-rpi-3.18.x/sound/soc/cod
+
+ // Reset error
+ ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
++ if (ret < 0) return ret;
+
+ // Trim oscillator
-+ ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00);
++ ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00);
++ if (ret < 0) return ret;
+ msleep(1000);
+
+ // Reset error
+ ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
++ if (ret < 0) return ret;
+
+ // Clock mode: 44/48kHz, MCLK=64xfs
+ ret = snd_soc_write(codec, TAS5713_CLOCK_CTRL, 0x60);
++ if (ret < 0) return ret;
+
+ // I2S 24bit
+ ret = snd_soc_write(codec, TAS5713_SERIAL_DATA_INTERFACE, 0x05);
++ if (ret < 0) return ret;
+
+ // Unmute
+ ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
++ if (ret < 0) return ret;
+ ret = snd_soc_write(codec, TAS5713_SOFT_MUTE, 0x00);
++ if (ret < 0) return ret;
+
+ // Set volume to 0db
+ ret = snd_soc_write(codec, TAS5713_VOL_MASTER, 0x00);
++ if (ret < 0) return ret;
+
+ // Now start programming the default initialization sequence
+ for (i = 0; i < ARRAY_SIZE(tas5713_init_sequence); ++i) {
+ ret = i2c_master_send(i2c,
+ tas5713_init_sequence[i].data,
+ tas5713_init_sequence[i].size);
-+
+ if (ret < 0) {
+ printk(KERN_INFO "TAS5713 CODEC PROBE: InitSeq returns: %d\n", ret);
+ }
@@ -281577,7 +287087,7 @@ diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.c linux-rpi-3.18.x/sound/soc/cod
+
+ // Unmute
+ ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
-+
++ if (ret < 0) return ret;
+
+ return 0;
+}
@@ -281721,9 +287231,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.c linux-rpi-3.18.x/sound/soc/cod
+MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>");
+MODULE_DESCRIPTION("ASoC driver for TAS5713");
+MODULE_LICENSE("GPL v2");
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas5713.h
+--- linux-3.18.5/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-rpi/sound/soc/codecs/tas5713.h 2015-02-02 09:28:05.622056446 +0100
@@ -0,0 +1,210 @@
+/*
+ * ASoC Driver for TAS5713
@@ -281935,9 +287445,9 @@ diff -Nur linux-3.18.3/sound/soc/codecs/tas5713.h linux-rpi-3.18.x/sound/soc/cod
+
+
+#endif /* _TAS5713_H */
-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
+diff -Nur linux-3.18.5/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c
+--- linux-3.18.5/sound/soc/codecs/wm8804.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-rpi/sound/soc/codecs/wm8804.c 2015-02-02 09:28:05.630056446 +0100
@@ -278,6 +278,7 @@
blen = 0x1;
break;
diff --git a/target/arm/raspberry-pi/patches/3.18.5/0001-add-support-for-rpi-proto-hardware.patch b/target/arm/raspberry-pi/patches/3.18.5/0001-add-support-for-rpi-proto-hardware.patch
new file mode 100644
index 000000000..ed5e96bef
--- /dev/null
+++ b/target/arm/raspberry-pi/patches/3.18.5/0001-add-support-for-rpi-proto-hardware.patch
@@ -0,0 +1,287 @@
+From 7174c08bd5f4e4976259c7a0894d302acc67321e Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbrodkorb@conet.de>
+Date: Mon, 2 Feb 2015 11:08:33 +0100
+Subject: [PATCH] add support for rpi-proto hardware
+
+Forward port of 3.10.x driver from https://github.com/koalo
+We are using a custom board and would like to use rpi 3.18.x
+kernel. Patch works fine for our embedded system.
+
+Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/rpi-proto-overlay.dts | 34 +++++++++
+ arch/arm/mach-bcm2708/bcm2708.c | 20 +++++
+ sound/soc/bcm/Kconfig | 8 ++
+ sound/soc/bcm/Makefile | 2 +
+ sound/soc/bcm/rpi-proto.c | 130 ++++++++++++++++++++++++++++++++
+ 6 files changed, 195 insertions(+)
+ create mode 100644 arch/arm/boot/dts/rpi-proto-overlay.dts
+ create mode 100644 sound/soc/bcm/rpi-proto.c
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 1b66478..7171eb6 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -61,6 +61,7 @@ dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb
++dtb-$(CONFIG_BCM2708_DT) += rpi-proto-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb
+ dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb
+diff --git a/arch/arm/boot/dts/rpi-proto-overlay.dts b/arch/arm/boot/dts/rpi-proto-overlay.dts
+new file mode 100644
+index 0000000..984545b
+--- /dev/null
++++ b/arch/arm/boot/dts/rpi-proto-overlay.dts
+@@ -0,0 +1,34 @@
++// Definitions for Rpi-Proto
++/dts-v1/;
++/plugin/;
++
++/ {
++ compatible = "brcm,bcm2708";
++
++ fragment@0 {
++ target = <&sound>;
++ __overlay__ {
++ compatible = "rpi-proto";
++ i2s-controller = <&i2s>;
++ status = "okay";
++ };
++ };
++
++ fragment@1 {
++ target = <&i2s>;
++ __overlay__ {
++ status = "okay";
++ };
++ };
++
++ fragment@2 {
++ target-path = "/";
++ __overlay__ {
++ wm8731-codec {
++ #sound-dai-cells = <0>;
++ compatible = "wlf,wm8731";
++ status = "okay";
++ };
++ };
++ };
++};
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
+index 762e17c..9ce0f78 100644
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -703,6 +703,21 @@ static struct i2c_board_info __initdata snd_tas5713_i2c_devices[] = {
+ };
+ #endif
+
++#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE)
++static struct platform_device snd_rpi_proto_device = {
++ .name = "snd-rpi-proto",
++ .id = 0,
++ .num_resources = 0,
++};
++
++static struct i2c_board_info __initdata snd_wm8731_i2c_devices[] = {
++ {
++ I2C_BOARD_INFO("wm8731", 0x1a)
++ },
++};
++
++#endif
++
+ #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
+ static struct platform_device snd_rpi_dac_device = {
+ .name = "snd-rpi-dac",
+@@ -922,6 +937,11 @@ void __init bcm2708_init(void)
+ i2c_register_board_info_dt(1, snd_tas5713_i2c_devices, ARRAY_SIZE(snd_tas5713_i2c_devices));
+ #endif
+
++#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE)
++ bcm_register_device_dt(&snd_rpi_proto_device);
++ i2c_register_board_info_dt(1, snd_wm8731_i2c_devices, ARRAY_SIZE(snd_wm8731_i2c_devices));
++#endif
++
+ #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
+ bcm_register_device_dt(&snd_rpi_dac_device);
+ bcm_register_device_dt(&snd_pcm1794a_codec_device);
+diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
+index a562ddf..1ea891d 100644
+--- a/sound/soc/bcm/Kconfig
++++ b/sound/soc/bcm/Kconfig
+@@ -54,6 +54,14 @@ config SND_BCM2708_SOC_RPI_DAC
+ help
+ Say Y or M if you want to add support for RPi-DAC.
+
++config SND_BCM2708_SOC_RPI_PROTO
++ tristate "Support for Rpi-PROTO"
++ depends on SND_BCM2708_SOC_I2S
++ select SND_SOC_WM8731
++ help
++ Say Y if you want to add support for Audio Codec Board -
++ PROTO (WM8731)
++
+ config SND_BCM2708_SOC_IQAUDIO_DAC
+ tristate "Support for IQaudIO-DAC"
+ depends on SND_BCM2708_SOC_I2S
+diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
+index 17ea2b0..883241b 100644
+--- a/sound/soc/bcm/Makefile
++++ b/sound/soc/bcm/Makefile
+@@ -14,6 +14,7 @@ snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
+ snd-soc-hifiberry-digi-objs := hifiberry_digi.o
+ snd-soc-hifiberry-amp-objs := hifiberry_amp.o
+ snd-soc-rpi-dac-objs := rpi-dac.o
++snd-soc-rpi-proto-objs := rpi-proto.o
+ snd-soc-iqaudio-dac-objs := iqaudio-dac.o
+
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
+@@ -21,4 +22,5 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
+ 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_RPI_PROTO) += snd-soc-rpi-proto.o
+ obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
+diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c
+new file mode 100644
+index 0000000..70b0166
+--- /dev/null
++++ b/sound/soc/bcm/rpi-proto.c
+@@ -0,0 +1,130 @@
++/*
++ * ASoC driver for PROTO AudioCODEC (with a WM8731)
++ * connected to a Raspberry Pi
++ *
++ * Author: Florian Meier, <koalo@koalo.de>
++ * Copyright 2013
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/soc.h>
++#include <sound/jack.h>
++
++#include "../codecs/wm8731.h"
++
++static const unsigned int wm8731_rates_12288000[] = {
++ 8000, 32000, 48000, 96000,
++};
++
++static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = {
++ .list = wm8731_rates_12288000,
++ .count = ARRAY_SIZE(wm8731_rates_12288000),
++};
++
++static int snd_rpi_proto_startup(struct snd_pcm_substream *substream)
++{
++ /* Setup constraints, because there is a 12.288 MHz XTAL on the board */
++ snd_pcm_hw_constraint_list(substream->runtime, 0,
++ SNDRV_PCM_HW_PARAM_RATE,
++ &wm8731_constraints_12288000);
++ return 0;
++}
++
++static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream,
++ struct snd_pcm_hw_params *params)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_dai *codec_dai = rtd->codec_dai;
++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
++ int sysclk = 12288000; /* This is fixed on this board */
++
++ /* Set proto bclk */
++ int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2);
++ if (ret < 0){
++ dev_err(substream->pcm->dev,
++ "Failed to set BCLK ratio %d\n", ret);
++ return ret;
++ }
++
++ /* Set proto sysclk */
++ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
++ sysclk, SND_SOC_CLOCK_IN);
++ if (ret < 0) {
++ dev_err(substream->pcm->dev,
++ "Failed to set WM8731 SYSCLK: %d\n", ret);
++ return ret;
++ }
++
++ return 0;
++}
++
++/* machine stream operations */
++static struct snd_soc_ops snd_rpi_proto_ops = {
++ .startup = snd_rpi_proto_startup,
++ .hw_params = snd_rpi_proto_hw_params,
++};
++
++static struct snd_soc_dai_link snd_rpi_proto_dai[] = {
++{
++ .name = "WM8731",
++ .stream_name = "WM8731 HiFi",
++ .cpu_dai_name = "bcm2708-i2s.0",
++ .codec_dai_name = "wm8731-hifi",
++ .platform_name = "bcm2708-i2s.0",
++ .codec_name = "wm8731.1-001a",
++ .dai_fmt = SND_SOC_DAIFMT_I2S
++ | SND_SOC_DAIFMT_NB_NF
++ | SND_SOC_DAIFMT_CBM_CFM,
++ .ops = &snd_rpi_proto_ops,
++},
++};
++
++/* audio machine driver */
++static struct snd_soc_card snd_rpi_proto = {
++ .name = "snd_rpi_proto",
++ .dai_link = snd_rpi_proto_dai,
++ .num_links = ARRAY_SIZE(snd_rpi_proto_dai),
++};
++
++static int snd_rpi_proto_probe(struct platform_device *pdev)
++{
++ int ret = 0;
++
++ snd_rpi_proto.dev = &pdev->dev;
++ ret = snd_soc_register_card(&snd_rpi_proto);
++ if (ret) {
++ dev_err(&pdev->dev,
++ "snd_soc_register_card() failed: %d\n", ret);
++ }
++
++ return ret;
++}
++
++
++static int snd_rpi_proto_remove(struct platform_device *pdev)
++{
++ return snd_soc_unregister_card(&snd_rpi_proto);
++}
++
++static struct platform_driver snd_rpi_proto_driver = {
++ .driver = {
++ .name = "snd-rpi-proto",
++ .owner = THIS_MODULE,
++ },
++ .probe = snd_rpi_proto_probe,
++ .remove = snd_rpi_proto_remove,
++};
++
++module_platform_driver(snd_rpi_proto_driver);
++
++MODULE_AUTHOR("Florian Meier");
++MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)");
++MODULE_LICENSE("GPL");
+--
+1.9.1
+
diff --git a/target/arm/raspberry-pi/patches/3.18.5/0002-allow-to-control-volume-for-each-channel.patch b/target/arm/raspberry-pi/patches/3.18.5/0002-allow-to-control-volume-for-each-channel.patch
new file mode 100644
index 000000000..76634e2e8
--- /dev/null
+++ b/target/arm/raspberry-pi/patches/3.18.5/0002-allow-to-control-volume-for-each-channel.patch
@@ -0,0 +1,26 @@
+From 05ca0b1b73f368564aef8cc4763e96a218cfefeb Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbrodkorb@conet.de>
+Date: Mon, 2 Feb 2015 09:51:56 +0100
+Subject: [PATCH 2/2] allow to control volume for each channel
+
+Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de>
+---
+ sound/arm/bcm2835-ctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c
+index aad905f..12e77f5 100755
+--- a/sound/arm/bcm2835-ctl.c
++++ b/sound/arm/bcm2835-ctl.c
+@@ -45,7 +45,7 @@ static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol,
+ audio_info(" ... IN\n");
+ if (kcontrol->private_value == PCM_PLAYBACK_VOLUME) {
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+- uinfo->count = 1;
++ uinfo->count = 2;
+ uinfo->value.integer.min = CTRL_VOL_MIN;
+ uinfo->value.integer.max = CTRL_VOL_MAX; /* 2303 */
+ } else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
+--
+1.9.1
+
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index e99e94b0d..47259f4ab 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.4
+default ADK_KERNEL_VERSION_3_18.5
-config ADK_KERNEL_VERSION_3_18_4
- prompt "3.18.4"
+config ADK_KERNEL_VERSION_3_18_5
+ prompt "3.18.5"
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 7c5b27710..cf2cb7db3 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.4" if ADK_KERNEL_VERSION_3_18_4
+ default "3.18.5" if ADK_KERNEL_VERSION_3_18_5
default "3.14.28" if ADK_KERNEL_VERSION_3_14_28
default "3.12.36" if ADK_KERNEL_VERSION_3_12_36
default "3.10.53" if ADK_KERNEL_VERSION_3_10_53
diff --git a/target/linux/patches/3.18.4/bsd-compatibility.patch b/target/linux/patches/3.18.5/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.18.4/bsd-compatibility.patch
+++ b/target/linux/patches/3.18.5/bsd-compatibility.patch
diff --git a/target/linux/patches/3.18.4/cleankernel.patch b/target/linux/patches/3.18.5/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.18.4/cleankernel.patch
+++ b/target/linux/patches/3.18.5/cleankernel.patch
diff --git a/target/linux/patches/3.18.4/cris-header.patch b/target/linux/patches/3.18.5/cris-header.patch
index 3db07e530..3db07e530 100644
--- a/target/linux/patches/3.18.4/cris-header.patch
+++ b/target/linux/patches/3.18.5/cris-header.patch
diff --git a/target/linux/patches/3.18.4/defaults.patch b/target/linux/patches/3.18.5/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.18.4/defaults.patch
+++ b/target/linux/patches/3.18.5/defaults.patch
diff --git a/target/linux/patches/3.18.4/export-symbol-for-exmap.patch b/target/linux/patches/3.18.5/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.18.4/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.18.5/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.18.4/gemalto.patch b/target/linux/patches/3.18.5/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.18.4/gemalto.patch
+++ b/target/linux/patches/3.18.5/gemalto.patch
diff --git a/target/linux/patches/3.18.4/initramfs-nosizelimit.patch b/target/linux/patches/3.18.5/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.18.4/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.18.5/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.18.4/lemote-rfkill.patch b/target/linux/patches/3.18.5/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.18.4/lemote-rfkill.patch
+++ b/target/linux/patches/3.18.5/lemote-rfkill.patch
diff --git a/target/linux/patches/3.18.4/microblaze-axi.patch b/target/linux/patches/3.18.5/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.18.4/microblaze-axi.patch
+++ b/target/linux/patches/3.18.5/microblaze-axi.patch
diff --git a/target/linux/patches/3.18.4/microblaze-ethernet.patch b/target/linux/patches/3.18.5/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.18.4/microblaze-ethernet.patch
+++ b/target/linux/patches/3.18.5/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.18.4/mkpiggy.patch b/target/linux/patches/3.18.5/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/target/linux/patches/3.18.4/mkpiggy.patch
+++ b/target/linux/patches/3.18.5/mkpiggy.patch
diff --git a/target/linux/patches/3.18.4/mtd-rootfs.patch b/target/linux/patches/3.18.5/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.18.4/mtd-rootfs.patch
+++ b/target/linux/patches/3.18.5/mtd-rootfs.patch
diff --git a/target/linux/patches/3.18.4/nfsv3-tcp.patch b/target/linux/patches/3.18.5/nfsv3-tcp.patch
index d5e07e1c2..d5e07e1c2 100644
--- a/target/linux/patches/3.18.4/nfsv3-tcp.patch
+++ b/target/linux/patches/3.18.5/nfsv3-tcp.patch
diff --git a/target/linux/patches/3.18.4/non-static.patch b/target/linux/patches/3.18.5/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.18.4/non-static.patch
+++ b/target/linux/patches/3.18.5/non-static.patch
diff --git a/target/linux/patches/3.18.4/patch-fblogo b/target/linux/patches/3.18.5/patch-fblogo
index f1fad64c1..f1fad64c1 100644
--- a/target/linux/patches/3.18.4/patch-fblogo
+++ b/target/linux/patches/3.18.5/patch-fblogo
diff --git a/target/linux/patches/3.18.4/patch-yaffs2 b/target/linux/patches/3.18.5/patch-yaffs2
index bb244c7ca..bb244c7ca 100644
--- a/target/linux/patches/3.18.4/patch-yaffs2
+++ b/target/linux/patches/3.18.5/patch-yaffs2
diff --git a/target/linux/patches/3.18.4/ppc64-missing-zlib.patch b/target/linux/patches/3.18.5/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.18.4/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.18.5/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.18.4/relocs.patch b/target/linux/patches/3.18.5/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/target/linux/patches/3.18.4/relocs.patch
+++ b/target/linux/patches/3.18.5/relocs.patch
diff --git a/target/linux/patches/3.18.4/sgidefs.patch b/target/linux/patches/3.18.5/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.18.4/sgidefs.patch
+++ b/target/linux/patches/3.18.5/sgidefs.patch
diff --git a/target/linux/patches/3.18.4/sortext.patch b/target/linux/patches/3.18.5/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.18.4/sortext.patch
+++ b/target/linux/patches/3.18.5/sortext.patch
diff --git a/target/linux/patches/3.18.4/startup.patch b/target/linux/patches/3.18.5/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.18.4/startup.patch
+++ b/target/linux/patches/3.18.5/startup.patch
diff --git a/target/linux/patches/3.18.4/wlan-cf.patch b/target/linux/patches/3.18.5/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.18.4/wlan-cf.patch
+++ b/target/linux/patches/3.18.5/wlan-cf.patch
diff --git a/target/linux/patches/3.18.4/xargs.patch b/target/linux/patches/3.18.5/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.18.4/xargs.patch
+++ b/target/linux/patches/3.18.5/xargs.patch
diff --git a/target/m68k/qemu-m68k/patches/3.18.4/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k/patches/3.18.5/m68k-coldfire-fec.patch
index ceaa21ce6..ceaa21ce6 100644
--- a/target/m68k/qemu-m68k/patches/3.18.4/m68k-coldfire-fec.patch
+++ b/target/m68k/qemu-m68k/patches/3.18.5/m68k-coldfire-fec.patch
diff --git a/target/m68k/qemu-m68k/patches/3.18.4/qemu-coldfire.patch b/target/m68k/qemu-m68k/patches/3.18.5/qemu-coldfire.patch
index 14d2f610b..14d2f610b 100644
--- a/target/m68k/qemu-m68k/patches/3.18.4/qemu-coldfire.patch
+++ b/target/m68k/qemu-m68k/patches/3.18.5/qemu-coldfire.patch
diff --git a/target/mips64/lemote-yeelong/patches/3.18.4/sm7xx-fb.patch b/target/mips64/lemote-yeelong/patches/3.18.5/sm7xx-fb.patch
index bcdec83cf..bcdec83cf 100644
--- a/target/mips64/lemote-yeelong/patches/3.18.4/sm7xx-fb.patch
+++ b/target/mips64/lemote-yeelong/patches/3.18.5/sm7xx-fb.patch