diff options
| -rw-r--r-- | package/bcm28xx-vc/Makefile | 8 | ||||
| -rw-r--r-- | package/kodi/Makefile | 4 | ||||
| -rw-r--r-- | target/appliances/kodi.appliance | 2 | ||||
| -rw-r--r-- | target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch | 3058 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 8 | ||||
| -rw-r--r-- | target/linux/config/Config.in.dma | 2 |
7 files changed, 1224 insertions, 1874 deletions
diff --git a/package/bcm28xx-vc/Makefile b/package/bcm28xx-vc/Makefile index 6c907ac3e..173eb90e0 100644 --- a/package/bcm28xx-vc/Makefile +++ b/package/bcm28xx-vc/Makefile @@ -41,6 +41,10 @@ bcm28xx-vc-libs-install: $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib $(CP) $(WRKINST)/opt/vc/lib/libvchiq_arm.so \ $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib + $(CP) $(WRKINST)/opt/vc/lib/libbcm_host.so \ + $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib + $(CP) $(WRKINST)/opt/vc/lib/libcontainers.so \ + $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib -rm -rf $(STAGING_TARGET_DIR)/opt/vc mkdir -p $(STAGING_TARGET_DIR)/opt/vc $(CP) $(WRKINST)/opt/vc/lib $(STAGING_TARGET_DIR)/opt/vc @@ -48,6 +52,10 @@ bcm28xx-vc-libs-install: bcm28xx-vc-gl-libs-install: $(INSTALL_DIR) $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib + $(CP) $(WRKINST)/opt/vc/lib/libmmal*.so \ + $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib + $(CP) $(WRKINST)/opt/vc/lib/libopenmaxil.so \ + $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib $(CP) $(WRKINST)/opt/vc/lib/libEGL.so \ $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib $(CP) $(WRKINST)/opt/vc/lib/libGLESv2.so \ diff --git a/package/kodi/Makefile b/package/kodi/Makefile index b5bba5b60..9af4d3fb2 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -73,9 +73,9 @@ PKGFD_WITH_WEBSERVER:= enable internal webserver support # libiconv missing, freescale GL libraries linked against glibc PKG_LIBC_DEPENDS:= glibc -PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc +PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc -PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc +PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance index f27f94061..f2099f0a8 100644 --- a/target/appliances/kodi.appliance +++ b/target/appliances/kodi.appliance @@ -8,7 +8,7 @@ config ADK_APPLIANCE_KODI select ADK_PACKAGE_KODI_WITH_SMB select ADK_PACKAGE_KODI_WITH_NFS select ADK_PACKAGE_KODI_WITH_SSH - select ADK_PACKAGE_KODI_WITH_CEC + select ADK_PACKAGE_KODI_WITH_CEC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_PACKAGE_KODI_WITH_RTMP select ADK_PACKAGE_KODI_WITH_BLURAY select ADK_PACKAGE_KODI_WITH_WEBSERVER diff --git a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch b/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch index 8e2ccfc95..1e7b73230 100644 --- a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch +++ b/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi ---- linux-3.18.8/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi +--- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,109 @@ +/include/ "skeleton.dtsi" + @@ -111,9 +111,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dt + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts ---- linux-3.18.8/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-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,107 @@ +/dts-v1/; + @@ -222,9 +222,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/bo + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ---- linux-3.18.8/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-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,117 @@ +/dts-v1/; + @@ -343,9 +343,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/a + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dts/bcm2709.dtsi ---- linux-3.18.8/arch/arm/boot/dts/bcm2709.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2709.dtsi 2015-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi +--- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,160 @@ +/include/ "skeleton.dtsi" + @@ -507,9 +507,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dt + <&v7_cpu3>, "clock-frequency:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts ---- linux-3.18.8/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2015-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,117 @@ +/dts-v1/; + @@ -628,9 +628,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/ + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-05 14:40:11.021715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,23 @@ +// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec +/dts-v1/; @@ -655,9 +655,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,22 @@ +// Definitions for DS1307 Real Time Clock +/dts-v1/; @@ -681,9 +681,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/a + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/enc28j60-overlay.dts linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/enc28j60-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,29 @@ +// Overlay for the Microchip ENC28J60 Ethernet Controller +/dts-v1/; @@ -714,9 +714,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/enc28j60-overlay.dts linux-rpi/arch/arm + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Amp/Amp+ +/dts-v1/; @@ -757,9 +757,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arc + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,34 @@ +// Definitions for HiFiBerry DAC +/dts-v1/; @@ -795,9 +795,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arc + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry DAC+ +/dts-v1/; @@ -838,9 +838,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Digi +/dts-v1/; @@ -881,9 +881,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/ar + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hy28a-overlay.dts linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/hy28a-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,87 @@ +/* + * Device Tree overlay for HY28A display @@ -972,9 +972,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hy28a-overlay.dts linux-rpi/arch/arm/bo + <&hy28a_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/hy28b-overlay.dts linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/hy28b-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,142 @@ +/* + * Device Tree overlay for HY28b display shield by Texy @@ -1118,9 +1118,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/hy28b-overlay.dts linux-rpi/arch/arm/bo + <&hy28b_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/i2c-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-05 14:40:11.025715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,43 @@ +// Definitions for several I2C based Real Time Clocks +/dts-v1/; @@ -1165,9 +1165,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-rpi/arch/arm/ + pcf8523 = <&pcf8523>,"status"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.061715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC +/dts-v1/; @@ -1208,9 +1208,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/ + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.061715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC+ +/dts-v1/; @@ -1251,9 +1251,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/a + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.065715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,57 @@ +// Definitions for lirc-rpi module +/dts-v1/; @@ -1312,9 +1312,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm + debug = <&lirc_rpi>,"rpi,debug:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile ---- linux-3.18.8/arch/arm/boot/dts/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/Makefile 2015-03-05 14:40:11.017715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boot/dts/Makefile +--- linux-3.18.9.orig/arch/arm/boot/dts/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/Makefile 2015-03-08 03:38:45.266040943 -0500 @@ -53,7 +53,41 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb @@ -1370,9 +1370,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Ma endif # *.dtb used to be generated in the directory above. Clean out the -diff -Nur linux-3.18.8/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-05 14:40:11.065715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,69 @@ +/* + * Device tree overlay for mcp251x/can0 on spi0.0 @@ -1443,9 +1443,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-rpi/arch + interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-05 14:40:11.069715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,22 @@ +// Definitions for PCF2127 Real Time Clock +/dts-v1/; @@ -1469,9 +1469,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-rpi/arch/ + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.069715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/pcf8523-rtc-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,22 @@ +// Definitions for PCF8523 Real Time Clock +/dts-v1/; @@ -1495,9 +1495,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-rpi/arch/ + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/piscreen-overlay.dts linux-rpi/arch/arm/boot/dts/piscreen-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/piscreen-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/piscreen-overlay.dts 2015-03-05 14:40:11.069715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts linux-3.18.9/arch/arm/boot/dts/piscreen-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/piscreen-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,94 @@ +/* + * Device Tree overlay for PiScreen 3.5" display shield by Ozzmaker @@ -1593,9 +1593,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/piscreen-overlay.dts linux-rpi/arch/arm + debug = <&piscreen>,"debug:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/pps-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.069715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pps-gpio-overlay.dts linux-3.18.9/arch/arm/boot/dts/pps-gpio-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/pps-gpio-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/pps-gpio-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,34 @@ +/dts-v1/; +/plugin/; @@ -1631,9 +1631,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/pps-gpio-overlay.dts linux-rpi/arch/arm + <&pps_pins>,"brcm,pins:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/rpi-display-overlay.dts linux-rpi/arch/arm/boot/dts/rpi-display-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/rpi-display-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/rpi-display-overlay.dts 2015-03-05 14:40:11.069715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts linux-3.18.9/arch/arm/boot/dts/rpi-display-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/rpi-display-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,81 @@ +/* + * Device Tree overlay for rpi-display by Watterott @@ -1716,9 +1716,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/rpi-display-overlay.dts linux-rpi/arch/ + xohms = <&rpidisplay_ts>,"ti,x-plate-ohms;0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-rpi/arch/arm/boot/dts/spi-bcm2835-overlay.dts ---- linux-3.18.8/arch/arm/boot/dts/spi-bcm2835-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/spi-bcm2835-overlay.dts 2015-03-05 14:40:11.073715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-3.18.9/arch/arm/boot/dts/spi-bcm2835-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/spi-bcm2835-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/spi-bcm2835-overlay.dts 2015-03-08 03:38:45.266040943 -0500 @@ -0,0 +1,18 @@ +/* + * Device tree overlay for spi-bcm2835 @@ -1738,9 +1738,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-rpi/arch/ + }; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/w1-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.081715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-overlay.dts linux-3.18.9/arch/arm/boot/dts/w1-gpio-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/w1-gpio-overlay.dts 2015-03-08 03:38:45.270040943 -0500 @@ -0,0 +1,39 @@ +// Definitions for w1-gpio module (without external pullup) +/dts-v1/; @@ -1781,9 +1781,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/w1-gpio-overlay.dts linux-rpi/arch/arm/ + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts ---- linux-3.18.8/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-03-05 14:40:11.081715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-3.18.9/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts +--- linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 2015-03-08 03:38:45.270040943 -0500 @@ -0,0 +1,41 @@ +// Definitions for w1-gpio module (with external pullup) +/dts-v1/; @@ -1826,9 +1826,9 @@ diff -Nur linux-3.18.8/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-rpi/ar + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-3.18.8/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/configs/bcm2709_defconfig ---- linux-3.18.8/arch/arm/configs/bcm2709_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcm2709_defconfig 2015-03-05 14:40:11.085715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch/arm/configs/bcm2709_defconfig +--- linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/configs/bcm2709_defconfig 2015-03-08 03:38:45.270040943 -0500 @@ -0,0 +1,1193 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 @@ -3023,9 +3023,9 @@ diff -Nur linux-3.18.8/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/con +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.8/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.18.8/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2015-03-05 14:40:11.085715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/arm/configs/bcmrpi_defconfig +--- linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/configs/bcmrpi_defconfig 2015-03-08 03:38:45.270040943 -0500 @@ -0,0 +1,1189 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 @@ -4216,9 +4216,9 @@ diff -Nur linux-3.18.8/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/conf +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.8/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/include/asm/dma-mapping.h ---- linux-3.18.8/arch/arm/include/asm/dma-mapping.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/dma-mapping.h 2015-03-05 14:40:11.093715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/include/asm/dma-mapping.h linux-3.18.9/arch/arm/include/asm/dma-mapping.h +--- linux-3.18.9.orig/arch/arm/include/asm/dma-mapping.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/include/asm/dma-mapping.h 2015-03-08 03:38:45.270040943 -0500 @@ -58,37 +58,21 @@ #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) @@ -4258,9 +4258,9 @@ diff -Nur linux-3.18.8/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/inc return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); } -diff -Nur linux-3.18.8/arch/arm/include/asm/entry-macro-multi.S linux-rpi/arch/arm/include/asm/entry-macro-multi.S ---- linux-3.18.8/arch/arm/include/asm/entry-macro-multi.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/entry-macro-multi.S 2015-03-05 14:40:11.093715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/include/asm/entry-macro-multi.S linux-3.18.9/arch/arm/include/asm/entry-macro-multi.S +--- linux-3.18.9.orig/arch/arm/include/asm/entry-macro-multi.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/include/asm/entry-macro-multi.S 2015-03-08 03:38:45.270040943 -0500 @@ -1,5 +1,6 @@ #include <asm/assembler.h> @@ -4276,9 +4276,9 @@ diff -Nur linux-3.18.8/arch/arm/include/asm/entry-macro-multi.S linux-rpi/arch/a .macro arch_irq_handler, symbol_name .align 5 -diff -Nur linux-3.18.8/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h ---- linux-3.18.8/arch/arm/include/asm/irqflags.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/irqflags.h 2015-03-05 14:40:11.097715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/include/asm/irqflags.h linux-3.18.9/arch/arm/include/asm/irqflags.h +--- linux-3.18.9.orig/arch/arm/include/asm/irqflags.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/include/asm/irqflags.h 2015-03-08 03:38:45.270040943 -0500 @@ -145,12 +145,22 @@ } @@ -4305,9 +4305,9 @@ diff -Nur linux-3.18.8/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/includ : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.18.8/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h ---- linux-3.18.8/arch/arm/include/asm/string.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/string.h 2015-03-05 14:40:11.097715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/include/asm/string.h linux-3.18.9/arch/arm/include/asm/string.h +--- linux-3.18.9.orig/arch/arm/include/asm/string.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/include/asm/string.h 2015-03-08 03:38:45.270040943 -0500 @@ -24,6 +24,11 @@ #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -4320,9 +4320,9 @@ diff -Nur linux-3.18.8/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/ extern void __memzero(void *ptr, __kernel_size_t n); #define memset(p,v,n) \ -diff -Nur linux-3.18.8/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h ---- linux-3.18.8/arch/arm/include/asm/uaccess.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/uaccess.h 2015-03-05 14:40:11.097715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/include/asm/uaccess.h linux-3.18.9/arch/arm/include/asm/uaccess.h +--- linux-3.18.9.orig/arch/arm/include/asm/uaccess.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/include/asm/uaccess.h 2015-03-08 03:38:45.270040943 -0500 @@ -475,6 +475,7 @@ #ifdef CONFIG_MMU @@ -4331,9 +4331,9 @@ diff -Nur linux-3.18.8/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n); -diff -Nur linux-3.18.8/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-3.18.8/arch/arm/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/Kconfig 2015-03-05 14:40:11.017715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/Kconfig linux-3.18.9/arch/arm/Kconfig +--- linux-3.18.9.orig/arch/arm/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/Kconfig 2015-03-08 03:38:45.270040943 -0500 @@ -381,6 +381,23 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -4394,9 +4394,9 @@ diff -Nur linux-3.18.8/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.18.8/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-3.18.8/arch/arm/Kconfig.debug 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/Kconfig.debug 2015-03-05 14:40:11.017715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/Kconfig.debug linux-3.18.9/arch/arm/Kconfig.debug +--- linux-3.18.9.orig/arch/arm/Kconfig.debug 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/Kconfig.debug 2015-03-08 03:38:45.270040943 -0500 @@ -985,6 +985,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -4412,9 +4412,9 @@ diff -Nur linux-3.18.8/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.18.8/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-3.18.8/arch/arm/kernel/fiqasm.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2015-03-05 14:40:11.137715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/kernel/fiqasm.S linux-3.18.9/arch/arm/kernel/fiqasm.S +--- linux-3.18.9.orig/arch/arm/kernel/fiqasm.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/kernel/fiqasm.S 2015-03-08 03:38:45.274040943 -0500 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 ret lr @@ -4423,9 +4423,9 @@ diff -Nur linux-3.18.8/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.18.8/arch/arm/kernel/head.S linux-rpi/arch/arm/kernel/head.S ---- linux-3.18.8/arch/arm/kernel/head.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/head.S 2015-03-05 14:40:11.137715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/kernel/head.S linux-3.18.9/arch/arm/kernel/head.S +--- linux-3.18.9.orig/arch/arm/kernel/head.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/kernel/head.S 2015-03-08 03:38:45.274040943 -0500 @@ -673,6 +673,14 @@ ldrcc r7, [r4], #4 @ use branch for delay slot bcc 1b @@ -4441,9 +4441,9 @@ diff -Nur linux-3.18.8/arch/arm/kernel/head.S linux-rpi/arch/arm/kernel/head.S #endif ENDPROC(__fixup_a_pv_table) -diff -Nur linux-3.18.8/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c ---- linux-3.18.8/arch/arm/kernel/process.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/process.c 2015-03-05 14:40:11.141715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/kernel/process.c linux-3.18.9/arch/arm/kernel/process.c +--- linux-3.18.9.orig/arch/arm/kernel/process.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/kernel/process.c 2015-03-08 03:38:45.274040943 -0500 @@ -166,6 +166,16 @@ } #endif @@ -4461,9 +4461,9 @@ diff -Nur linux-3.18.8/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proce /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.18.8/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h ---- linux-3.18.8/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/arm-mem.h 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/arm-mem.h linux-3.18.9/arch/arm/lib/arm-mem.h +--- linux-3.18.9.orig/arch/arm/lib/arm-mem.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/arm-mem.h 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,159 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -4624,9 +4624,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h + .endif +92: +.endm -diff -Nur linux-3.18.8/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy_from_user.S ---- linux-3.18.8/arch/arm/lib/copy_from_user.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/lib/copy_from_user.S 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/copy_from_user.S linux-3.18.9/arch/arm/lib/copy_from_user.S +--- linux-3.18.9.orig/arch/arm/lib/copy_from_user.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/copy_from_user.S 2015-03-08 03:38:45.274040943 -0500 @@ -84,11 +84,13 @@ .text @@ -4642,9 +4642,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy .pushsection .fixup,"ax" .align 0 -diff -Nur linux-3.18.8/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports_rpi.c ---- linux-3.18.8/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/exports_rpi.c 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/exports_rpi.c linux-3.18.9/arch/arm/lib/exports_rpi.c +--- linux-3.18.9.orig/arch/arm/lib/exports_rpi.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/exports_rpi.c 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2014, Raspberry Pi (Trading) Ltd. @@ -4683,9 +4683,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports +#include <linux/module.h> + +EXPORT_SYMBOL(memcmp); -diff -Nur linux-3.18.8/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile ---- linux-3.18.8/arch/arm/lib/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/lib/Makefile 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/Makefile linux-3.18.9/arch/arm/lib/Makefile +--- linux-3.18.9.orig/arch/arm/lib/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/Makefile 2015-03-08 03:38:45.274040943 -0500 @@ -6,15 +6,24 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ @@ -4714,9 +4714,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile mmu-y := clear_user.o copy_page.o getuser.o putuser.o # the code in uaccess.S is not preemption safe and -diff -Nur linux-3.18.8/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_rpi.S ---- linux-3.18.8/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcmp_rpi.S 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/memcmp_rpi.S linux-3.18.9/arch/arm/lib/memcmp_rpi.S +--- linux-3.18.9.orig/arch/arm/lib/memcmp_rpi.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/memcmp_rpi.S 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,285 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5003,9 +5003,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_r + .unreq DAT7 + .unreq OFF +ENDPROC(memcmp) -diff -Nur linux-3.18.8/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymove.h ---- linux-3.18.8/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcpymove.h 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpymove.h linux-3.18.9/arch/arm/lib/memcpymove.h +--- linux-3.18.9.orig/arch/arm/lib/memcpymove.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/memcpymove.h 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,506 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5513,9 +5513,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymo + .unreq LAST + .unreq OFF +.endm -diff -Nur linux-3.18.8/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_rpi.S ---- linux-3.18.8/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcpy_rpi.S 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpy_rpi.S linux-3.18.9/arch/arm/lib/memcpy_rpi.S +--- linux-3.18.9.orig/arch/arm/lib/memcpy_rpi.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/memcpy_rpi.S 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,59 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5576,9 +5576,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_r +ENTRY(memcpy) + memcpy 0 +ENDPROC(memcpy) -diff -Nur linux-3.18.8/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove_rpi.S ---- linux-3.18.8/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memmove_rpi.S 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/memmove_rpi.S linux-3.18.9/arch/arm/lib/memmove_rpi.S +--- linux-3.18.9.orig/arch/arm/lib/memmove_rpi.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/memmove_rpi.S 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,61 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5641,9 +5641,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove + bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */ + memcpy 1 +ENDPROC(memmove) -diff -Nur linux-3.18.8/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_rpi.S ---- linux-3.18.8/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memset_rpi.S 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/memset_rpi.S linux-3.18.9/arch/arm/lib/memset_rpi.S +--- linux-3.18.9.orig/arch/arm/lib/memset_rpi.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/memset_rpi.S 2015-03-08 03:38:45.274040943 -0500 @@ -0,0 +1,121 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5766,9 +5766,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_r + .unreq DAT2 + .unreq DAT3 +ENDPROC(memset) -diff -Nur linux-3.18.8/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib/uaccess_with_memcpy.c ---- linux-3.18.8/arch/arm/lib/uaccess_with_memcpy.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/lib/uaccess_with_memcpy.c 2015-03-05 14:40:11.145715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/lib/uaccess_with_memcpy.c linux-3.18.9/arch/arm/lib/uaccess_with_memcpy.c +--- linux-3.18.9.orig/arch/arm/lib/uaccess_with_memcpy.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/lib/uaccess_with_memcpy.c 2015-03-08 03:38:45.274040943 -0500 @@ -22,6 +22,14 @@ #include <asm/current.h> #include <asm/page.h> @@ -5912,9 +5912,9 @@ diff -Nur linux-3.18.8/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.18.8/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.18.9/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/armctrl.c 2015-03-08 03:38:45.294040942 -0500 @@ -0,0 +1,315 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -6231,9 +6231,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-b + armctrl_dt_init(); + return 0; +} -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.18.8/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.18.9/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/armctrl.h 2015-03-08 03:38:45.294040942 -0500 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -6262,9 +6262,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.c 2015-03-08 03:38:45.294040942 -0500 @@ -0,0 +1,1132 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -7398,9 +7398,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-b +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.8/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.18.9/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -7828,9 +7828,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -7881,9 +7881,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c ---- linux-3.18.8/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/dma.c linux-3.18.9/arch/arm/mach-bcm2708/dma.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/dma.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/dma.c 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,409 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -8294,9 +8294,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm27 +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_control.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -8717,9 +8717,9 @@ diff -Nur linux-3.18.8/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.8/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,62 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -8783,9 +8783,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/ +}; + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/clkdev.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -8794,9 +8794,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.18.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -8820,9 +8820,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/dma.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,94 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -8918,9 +8918,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/a + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.18.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -8991,9 +8991,9 @@ diff -Nur linux-3.18.8/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.8/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/frc.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -9033,9 +9033,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/gpio.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -9054,9 +9054,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/hardware.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -9086,9 +9086,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/a +#include <mach/platform.h> + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/io.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/io.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -9117,9 +9117,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/irqs.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -9320,9 +9320,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/memory.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -9381,9 +9381,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/platform.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -9613,9 +9613,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/power.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/power.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -9643,9 +9643,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/system.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/system.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -9685,9 +9685,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/timex.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -9712,9 +9712,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/uncompress.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -9800,9 +9800,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-03-08 03:38:45.298040942 -0500 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -9969,9 +9969,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/ +#define DEVICE_FILE_NAME "vcio" + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -10008,9 +10008,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arc +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,181 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10193,9 +10193,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,55 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10252,9 +10252,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,82 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10338,9 +10338,9 @@ diff -Nur linux-3.18.8/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.8/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -10362,9 +10362,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,233 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10599,9 +10599,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux- +/* ---- Function Prototypes ---------------------------------------------- */ + +#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig ---- linux-3.18.8/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Kconfig linux-3.18.9/arch/arm/mach-bcm2708/Kconfig +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/Kconfig 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,52 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -10655,9 +10655,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile ---- linux-3.18.8/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile linux-3.18.9/arch/arm/mach-bcm2708/Makefile +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/Makefile 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -10666,16 +10666,16 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bc +obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o dma.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.18.8/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.18.9/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile.boot 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/Makefile.boot 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c ---- linux-3.18.8/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/power.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/power.c linux-3.18.9/arch/arm/mach-bcm2708/power.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/power.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/power.c 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,197 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -10874,9 +10874,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c ---- linux-3.18.8/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vcio.c linux-3.18.9/arch/arm/mach-bcm2708/vcio.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/vcio.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/vcio.c 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,484 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -11362,9 +11362,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.18.8/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-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.18.9/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2708/vc_mem.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2708/vc_mem.c 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -11798,9 +11798,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bc +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/armctrl.c linux-rpi/arch/arm/mach-bcm2709/armctrl.c ---- linux-3.18.8/arch/arm/mach-bcm2709/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/armctrl.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.c linux-3.18.9/arch/arm/mach-bcm2709/armctrl.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/armctrl.c 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,369 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -12171,9 +12171,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/armctrl.c linux-rpi/arch/arm/mach-b + armctrl_dt_init(); + return 0; +} -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/armctrl.h linux-rpi/arch/arm/mach-bcm2709/armctrl.h ---- linux-3.18.8/arch/arm/mach-bcm2709/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/armctrl.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.h linux-3.18.9/arch/arm/mach-bcm2709/armctrl.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/armctrl.h 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -12202,9 +12202,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c ---- linux-3.18.8/arch/arm/mach-bcm2709/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-3.18.9/arch/arm/mach-bcm2709/bcm2708_gpio.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2708_gpio.c 2015-03-08 03:38:45.302040942 -0500 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -12632,9 +12632,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/bcm2709.c linux-rpi/arch/arm/mach-bcm2709/bcm2709.c ---- linux-3.18.8/arch/arm/mach-bcm2709/bcm2709.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.c linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.c 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,1297 @@ +/* + * linux/arch/arm/mach-bcm2709/bcm2709.c @@ -13933,9 +13933,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/bcm2709.c linux-rpi/arch/arm/mach-b +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.8/arch/arm/mach-bcm2709/bcm2709.h linux-rpi/arch/arm/mach-bcm2709/bcm2709.h ---- linux-3.18.8/arch/arm/mach-bcm2709/bcm2709.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.h linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -13986,9 +13986,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/bcm2709.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/clock.c linux-rpi/arch/arm/mach-bcm2709/clock.c ---- linux-3.18.8/arch/arm/mach-bcm2709/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/clock.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.c linux-3.18.9/arch/arm/mach-bcm2709/clock.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/clock.c 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -14051,9 +14051,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/clock.c linux-rpi/arch/arm/mach-bcm + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/clock.h linux-rpi/arch/arm/mach-bcm2709/clock.h ---- linux-3.18.8/arch/arm/mach-bcm2709/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/clock.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.h linux-3.18.9/arch/arm/mach-bcm2709/clock.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/clock.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -14079,9 +14079,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/clock.h linux-rpi/arch/arm/mach-bcm +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/delay.S linux-rpi/arch/arm/mach-bcm2709/delay.S ---- linux-3.18.8/arch/arm/mach-bcm2709/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/delay.S 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/delay.S linux-3.18.9/arch/arm/mach-bcm2709/delay.S +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/delay.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/delay.S 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -14104,9 +14104,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/delay.S linux-rpi/arch/arm/mach-bcm + bhi bcm2708_delay + mov pc, lr +ENDPROC(bcm2708_delay) -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/dma.c linux-rpi/arch/arm/mach-bcm2709/dma.c ---- linux-3.18.8/arch/arm/mach-bcm2709/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/dma.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dma.c linux-3.18.9/arch/arm/mach-bcm2709/dma.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/dma.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/dma.c 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,409 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -14517,9 +14517,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/dma.c linux-rpi/arch/arm/mach-bcm27 +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/dmaer.c linux-rpi/arch/arm/mach-bcm2709/dmaer.c ---- linux-3.18.8/arch/arm/mach-bcm2709/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/dmaer.c 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dmaer.c linux-3.18.9/arch/arm/mach-bcm2709/dmaer.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/dmaer.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/dmaer.c 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,886 @@ +#include <linux/init.h> +#include <linux/sched.h> @@ -15407,9 +15407,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/dmaer.c linux-rpi/arch/arm/mach-bcm +MODULE_AUTHOR("Simon Hall"); +module_init(dmaer_init); +module_exit(dmaer_exit); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_control.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_control.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_control.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_control.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,493 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -15904,9 +15904,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-rp +#define ARM_LOCAL_MAILBOX3_CLR3 HW_REGISTER_RW(ARM_LOCAL_BASE+0x0FC) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_power.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_power.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_power.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_power.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_power.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_power.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,62 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -15970,16 +15970,16 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/arm_power.h linux-rpi/ +}; + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/barriers.h linux-rpi/arch/arm/mach-bcm2709/include/mach/barriers.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/barriers.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/barriers.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/barriers.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/barriers.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/barriers.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/barriers.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,3 @@ +#define mb() dsb() +#define rmb() dsb() +#define wmb() mb() -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2709/include/mach/clkdev.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/clkdev.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/clkdev.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/clkdev.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -15988,9 +15988,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/debug-macro.S ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/debug-macro.S 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-3.18.9/arch/arm/mach-bcm2709/include/mach/debug-macro.S +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/debug-macro.S 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -16014,9 +16014,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-rp + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2709/include/mach/dma.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/dma.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/dma.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/dma.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/dma.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/dma.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,94 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -16112,9 +16112,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/dma.h linux-rpi/arch/a + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/entry-macro.S ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/entry-macro.S 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-3.18.9/arch/arm/mach-bcm2709/include/mach/entry-macro.S +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/entry-macro.S 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -16236,9 +16236,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-rp + .macro arch_irq_handler_default +1: get_irqnr_and_base r0, r2, r6, lr + .endm -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/frc.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/frc.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/frc.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/frc.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/frc.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/frc.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -16278,9 +16278,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2709/include/mach/gpio.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/gpio.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/gpio.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/gpio.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/gpio.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/gpio.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -16299,9 +16299,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2709/include/mach/hardware.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/hardware.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/hardware.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/hardware.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/hardware.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/hardware.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -16331,9 +16331,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/hardware.h linux-rpi/a +#include <mach/platform.h> + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/io.h linux-rpi/arch/arm/mach-bcm2709/include/mach/io.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/io.h 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/io.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/io.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/io.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/io.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -16362,9 +16362,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2709/include/mach/irqs.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/irqs.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/irqs.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/irqs.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/irqs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/irqs.h 2015-03-08 03:38:45.306040942 -0500 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -16591,9 +16591,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2709/include/mach/memory.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/memory.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/memory.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/memory.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/memory.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/memory.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -16652,9 +16652,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2709/include/mach/platform.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/platform.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/platform.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/platform.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/platform.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/platform.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -16881,9 +16881,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/power.h linux-rpi/arch/arm/mach-bcm2709/include/mach/power.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/power.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/power.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/power.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/power.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/power.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -16911,9 +16911,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/power.h linux-rpi/arch +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/system.h linux-rpi/arch/arm/mach-bcm2709/include/mach/system.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/system.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/system.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/system.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/system.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/system.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -16953,9 +16953,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2709/include/mach/timex.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/timex.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/timex.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/timex.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/timex.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/timex.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -16980,9 +16980,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2709/include/mach/uncompress.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/uncompress.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/uncompress.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/uncompress.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -17068,9 +17068,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vcio.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vcio.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vcio.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vcio.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vcio.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vcio.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -17237,9 +17237,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vcio.h linux-rpi/arch/ +#define DEVICE_FILE_NAME "vcio" + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_mem.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_mem.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_mem.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_mem.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_mem.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -17276,9 +17276,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-rpi/arc +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_support.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_support.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_support.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_support.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -17349,9 +17349,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-rpi + unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); + +#endif -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vmalloc.h ---- linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vmalloc.h 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vmalloc.h +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vmalloc.h 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -17373,9 +17373,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xff000000) -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/Kconfig linux-rpi/arch/arm/mach-bcm2709/Kconfig ---- linux-3.18.8/arch/arm/mach-bcm2709/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Kconfig 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Kconfig linux-3.18.9/arch/arm/mach-bcm2709/Kconfig +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/Kconfig 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,49 @@ +menu "Broadcom BCM2709 Implementations" + depends on ARCH_BCM2709 @@ -17426,9 +17426,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/Makefile linux-rpi/arch/arm/mach-bcm2709/Makefile ---- linux-3.18.8/arch/arm/mach-bcm2709/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Makefile 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile linux-3.18.9/arch/arm/mach-bcm2709/Makefile +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/Makefile 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -17437,16 +17437,16 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/Makefile linux-rpi/arch/arm/mach-bc +obj-$(CONFIG_MACH_BCM2709) += bcm2709.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.8/arch/arm/mach-bcm2709/Makefile.boot linux-rpi/arch/arm/mach-bcm2709/Makefile.boot ---- linux-3.18.8/arch/arm/mach-bcm2709/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Makefile.boot 2015-03-05 14:40:11.153715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile.boot linux-3.18.9/arch/arm/mach-bcm2709/Makefile.boot +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile.boot 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/Makefile.boot 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/power.c linux-rpi/arch/arm/mach-bcm2709/power.c ---- linux-3.18.8/arch/arm/mach-bcm2709/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/power.c 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/power.c linux-3.18.9/arch/arm/mach-bcm2709/power.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/power.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/power.c 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,195 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -17643,9 +17643,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/power.c linux-rpi/arch/arm/mach-bcm +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vcio.c linux-rpi/arch/arm/mach-bcm2709/vcio.c ---- linux-3.18.8/arch/arm/mach-bcm2709/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/vcio.c 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vcio.c linux-3.18.9/arch/arm/mach-bcm2709/vcio.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/vcio.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/vcio.c 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,484 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -18131,9 +18131,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vcio.c linux-rpi/arch/arm/mach-bcm2 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vc_mem.c linux-rpi/arch/arm/mach-bcm2709/vc_mem.c ---- linux-3.18.8/arch/arm/mach-bcm2709/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/vc_mem.c 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_mem.c linux-3.18.9/arch/arm/mach-bcm2709/vc_mem.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_mem.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/vc_mem.c 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,431 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -18566,9 +18566,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vc_mem.c linux-rpi/arch/arm/mach-bc +module_param(phys_addr, uint, 0644); +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); -diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vc_support.c linux-rpi/arch/arm/mach-bcm2709/vc_support.c ---- linux-3.18.8/arch/arm/mach-bcm2709/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/vc_support.c 2015-03-05 14:40:11.157715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_support.c linux-3.18.9/arch/arm/mach-bcm2709/vc_support.c +--- linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_support.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/arch/arm/mach-bcm2709/vc_support.c 2015-03-08 03:38:45.310040942 -0500 @@ -0,0 +1,318 @@ +/* + * vc_support.c @@ -18888,9 +18888,9 @@ diff -Nur linux-3.18.8/arch/arm/mach-bcm2709/vc_support.c linux-rpi/arch/arm/mac + return 1; + } +} -diff -Nur linux-3.18.8/arch/arm/Makefile linux-rpi/arch/arm/Makefile ---- linux-3.18.8/arch/arm/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/Makefile 2015-03-05 14:40:11.017715840 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/Makefile linux-3.18.9/arch/arm/Makefile +--- linux-3.18.9.orig/arch/arm/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/Makefile 2015-03-08 03:38:45.310040942 -0500 @@ -146,6 +146,8 @@ machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia @@ -18900,9 +18900,9 @@ diff -Nur linux-3.18.8/arch/arm/Makefile linux-rpi/arch/arm/Makefile machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.18.8/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig ---- linux-3.18.8/arch/arm/mm/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/mm/Kconfig 2015-03-05 14:40:11.261715839 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mm/Kconfig linux-3.18.9/arch/arm/mm/Kconfig +--- linux-3.18.9.orig/arch/arm/mm/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/mm/Kconfig 2015-03-08 03:38:45.310040942 -0500 @@ -358,7 +358,7 @@ # ARMv6 @@ -18912,9 +18912,9 @@ diff -Nur linux-3.18.8/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.18.8/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ---- linux-3.18.8/arch/arm/mm/proc-v6.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/mm/proc-v6.S 2015-03-05 14:40:11.277715838 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v6.S linux-3.18.9/arch/arm/mm/proc-v6.S +--- linux-3.18.9.orig/arch/arm/mm/proc-v6.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/mm/proc-v6.S 2015-03-08 03:38:45.310040942 -0500 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -18938,9 +18938,9 @@ diff -Nur linux-3.18.8/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ret lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.18.8/arch/arm/mm/proc-v7.S linux-rpi/arch/arm/mm/proc-v7.S ---- linux-3.18.8/arch/arm/mm/proc-v7.S 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/mm/proc-v7.S 2015-03-05 14:40:11.277715838 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v7.S linux-3.18.9/arch/arm/mm/proc-v7.S +--- linux-3.18.9.orig/arch/arm/mm/proc-v7.S 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/mm/proc-v7.S 2015-03-08 03:38:45.314040942 -0500 @@ -441,6 +441,7 @@ orr r0, r0, r6 @ set them THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions @@ -18949,9 +18949,9 @@ diff -Nur linux-3.18.8/arch/arm/mm/proc-v7.S linux-rpi/arch/arm/mm/proc-v7.S ENDPROC(__v7_setup) .align 2 -diff -Nur linux-3.18.8/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types ---- linux-3.18.8/arch/arm/tools/mach-types 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/arch/arm/tools/mach-types 2015-03-05 14:40:11.297715838 +0100 +diff -Nur linux-3.18.9.orig/arch/arm/tools/mach-types linux-3.18.9/arch/arm/tools/mach-types +--- linux-3.18.9.orig/arch/arm/tools/mach-types 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/arch/arm/tools/mach-types 2015-03-08 03:38:45.314040942 -0500 @@ -522,6 +522,8 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -18961,9 +18961,9 @@ diff -Nur linux-3.18.8/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-t ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 -diff -Nur linux-3.18.8/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-3.18.8/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2015-03-05 14:40:10.925715841 +0100 +diff -Nur linux-3.18.9.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.18.9/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-3.18.9.orig/Documentation/video4linux/bcm2835-v4l2.txt 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/Documentation/video4linux/bcm2835-v4l2.txt 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -19025,9 +19025,9 @@ diff -Nur linux-3.18.8/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Docu +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-3.18.8/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig ---- linux-3.18.8/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Kconfig 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/Kconfig linux-3.18.9/drivers/char/broadcom/Kconfig +--- linux-3.18.9.orig/drivers/char/broadcom/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/Kconfig 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,22 @@ +# +# Broadcom char driver config @@ -19051,15 +19051,15 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broa + help + Support for the VC shared memory on the Broadcom reference + design. Uses the VCHIQ stack. -diff -Nur linux-3.18.8/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile ---- linux-3.18.8/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Makefile 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/Makefile linux-3.18.9/drivers/char/broadcom/Makefile +--- linux-3.18.9.orig/drivers/char/broadcom/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/Makefile 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ +obj-$(CONFIG_BCM_VC_SM) += vc_sm/ -diff -Nur linux-3.18.8/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.18.8/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.18.9/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.18.9.orig/drivers/char/broadcom/vc_cma/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/vc_cma/Makefile 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,14 @@ +ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs +ccflags-y += -Werror @@ -19075,9 +19075,9 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/c +obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o + +vc-cma-objs := vc_cma.o -diff -Nur linux-3.18.8/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.18.8/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-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.18.9/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-3.18.9.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/vc_cma/vc_cma.c 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,1193 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20272,9 +20272,9 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/c +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/char/broadcom/vc_sm/Makefile ---- linux-3.18.8/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_sm/Makefile 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/Makefile linux-3.18.9/drivers/char/broadcom/vc_sm/Makefile +--- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/vc_sm/Makefile 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,21 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 + @@ -20297,9 +20297,9 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/ch +vc-sm-objs := \ + vmcs_sm.o \ + vc_vchi_sm.o -diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c ---- linux-3.18.8/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-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-3.18.9/drivers/char/broadcom/vc_sm/vc_vchi_sm.c +--- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,492 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -20793,9 +20793,9 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/driver + return vc_vchi_sm_send_msg(handle, VC_SM_MSG_TYPE_ACTION_CLEAN, + msg, sizeof(*msg), 0, 0, 0, 0); +} -diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c ---- linux-3.18.8/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-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-3.18.9/drivers/char/broadcom/vc_sm/vmcs_sm.c +--- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/broadcom/vc_sm/vmcs_sm.c 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,3163 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -23960,9 +23960,9 @@ diff -Nur linux-3.18.8/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/c +MODULE_AUTHOR("Broadcom"); +MODULE_DESCRIPTION("VideoCore SharedMemory Driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c ---- linux-3.18.8/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-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.18.9/drivers/char/hw_random/bcm2708-rng.c +--- linux-3.18.9.orig/drivers/char/hw_random/bcm2708-rng.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/char/hw_random/bcm2708-rng.c 2015-03-08 03:38:45.314040942 -0500 @@ -0,0 +1,118 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24082,9 +24082,9 @@ diff -Nur linux-3.18.8/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/ch + +MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver"); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-3.18.8/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig ---- linux-3.18.8/drivers/char/hw_random/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/Kconfig 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Kconfig linux-3.18.9/drivers/char/hw_random/Kconfig +--- linux-3.18.9.orig/drivers/char/hw_random/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/char/hw_random/Kconfig 2015-03-08 03:38:45.314040942 -0500 @@ -320,6 +320,17 @@ If unsure, say Y. @@ -24103,9 +24103,9 @@ diff -Nur linux-3.18.8/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_ config HW_RANDOM_MSM tristate "Qualcomm SoCs Random Number Generator support" depends on HW_RANDOM && ARCH_QCOM -diff -Nur linux-3.18.8/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile ---- linux-3.18.8/drivers/char/hw_random/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/Makefile 2015-03-05 14:40:12.661715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Makefile linux-3.18.9/drivers/char/hw_random/Makefile +--- linux-3.18.9.orig/drivers/char/hw_random/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/char/hw_random/Makefile 2015-03-08 03:38:45.314040942 -0500 @@ -28,5 +28,6 @@ obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o @@ -24113,9 +24113,9 @@ diff -Nur linux-3.18.8/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o -diff -Nur linux-3.18.8/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig ---- linux-3.18.8/drivers/char/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/char/Kconfig 2015-03-05 14:40:12.657715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/Kconfig linux-3.18.9/drivers/char/Kconfig +--- linux-3.18.9.orig/drivers/char/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/char/Kconfig 2015-03-08 03:38:45.314040942 -0500 @@ -581,6 +581,8 @@ source "drivers/s390/char/Kconfig" @@ -24125,17 +24125,17 @@ diff -Nur linux-3.18.8/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Nur linux-3.18.8/drivers/char/Makefile linux-rpi/drivers/char/Makefile ---- linux-3.18.8/drivers/char/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/char/Makefile 2015-03-05 14:40:12.657715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/char/Makefile linux-3.18.9/drivers/char/Makefile +--- linux-3.18.9.orig/drivers/char/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/char/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -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.8/drivers/clocksource/arm_arch_timer.c linux-rpi/drivers/clocksource/arm_arch_timer.c ---- linux-3.18.8/drivers/clocksource/arm_arch_timer.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/clocksource/arm_arch_timer.c 2015-03-05 14:40:12.693715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/clocksource/arm_arch_timer.c linux-3.18.9/drivers/clocksource/arm_arch_timer.c +--- linux-3.18.9.orig/drivers/clocksource/arm_arch_timer.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/clocksource/arm_arch_timer.c 2015-03-08 03:38:45.318040942 -0500 @@ -795,3 +795,39 @@ } CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", @@ -24176,9 +24176,9 @@ diff -Nur linux-3.18.8/drivers/clocksource/arm_arch_timer.c linux-rpi/drivers/cl + arch_timer_common_init(); + return 0; +} -diff -Nur linux-3.18.8/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-3.18.8/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2015-03-05 14:40:12.697715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.18.9/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-3.18.9.orig/drivers/cpufreq/bcm2835-cpufreq.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/cpufreq/bcm2835-cpufreq.c 2015-03-08 03:38:45.318040942 -0500 @@ -0,0 +1,224 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -24404,9 +24404,9 @@ diff -Nur linux-3.18.8/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufr + +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); -diff -Nur linux-3.18.8/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm ---- linux-3.18.8/drivers/cpufreq/Kconfig.arm 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/Kconfig.arm 2015-03-05 14:40:12.697715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/cpufreq/Kconfig.arm linux-3.18.9/drivers/cpufreq/Kconfig.arm +--- linux-3.18.9.orig/drivers/cpufreq/Kconfig.arm 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/cpufreq/Kconfig.arm 2015-03-08 03:38:45.318040942 -0500 @@ -241,6 +241,14 @@ help This adds the CPUFreq driver support for SPEAr SOCs. @@ -24422,9 +24422,9 @@ diff -Nur linux-3.18.8/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kco config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA -diff -Nur linux-3.18.8/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile ---- linux-3.18.8/drivers/cpufreq/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/Makefile 2015-03-05 14:40:12.697715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/cpufreq/Makefile linux-3.18.9/drivers/cpufreq/Makefile +--- linux-3.18.9.orig/drivers/cpufreq/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/cpufreq/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -75,6 +75,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o @@ -24433,9 +24433,9 @@ diff -Nur linux-3.18.8/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefi obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o -diff -Nur linux-3.18.8/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c ---- linux-3.18.8/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2015-03-05 14:40:12.717715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/dma/bcm2708-dmaengine.c linux-3.18.9/drivers/dma/bcm2708-dmaengine.c +--- linux-3.18.9.orig/drivers/dma/bcm2708-dmaengine.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/dma/bcm2708-dmaengine.c 2015-03-08 03:38:45.318040942 -0500 @@ -0,0 +1,1052 @@ +/* + * BCM2835 DMA engine support @@ -25489,9 +25489,9 @@ diff -Nur linux-3.18.8/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_AUTHOR("Gellert Weisz <gellert@raspberrypi.org>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig ---- linux-3.18.8/drivers/dma/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/dma/Kconfig 2015-03-05 14:40:12.717715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/dma/Kconfig linux-3.18.9/drivers/dma/Kconfig +--- linux-3.18.9.orig/drivers/dma/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/dma/Kconfig 2015-03-08 03:38:45.318040942 -0500 @@ -330,6 +330,12 @@ select DMA_ENGINE select DMA_VIRTUAL_CHANNELS @@ -25505,9 +25505,9 @@ diff -Nur linux-3.18.8/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig config TI_CPPI41 tristate "AM33xx CPPI41 DMA support" depends on ARCH_OMAP -diff -Nur linux-3.18.8/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile ---- linux-3.18.8/drivers/dma/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/dma/Makefile 2015-03-05 14:40:12.717715830 +0100 +diff -Nur linux-3.18.9.orig/drivers/dma/Makefile linux-3.18.9/drivers/dma/Makefile +--- linux-3.18.9.orig/drivers/dma/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/dma/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -38,6 +38,7 @@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o @@ -25516,9 +25516,9 @@ diff -Nur linux-3.18.8/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_TI_CPPI41) += cppi41.o -diff -Nur linux-3.18.8/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhid/hid-core.c ---- linux-3.18.8/drivers/hid/usbhid/hid-core.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/hid/usbhid/hid-core.c 2015-03-05 14:40:13.017715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/hid/usbhid/hid-core.c linux-3.18.9/drivers/hid/usbhid/hid-core.c +--- linux-3.18.9.orig/drivers/hid/usbhid/hid-core.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/hid/usbhid/hid-core.c 2015-03-08 03:38:45.318040942 -0500 @@ -49,7 +49,7 @@ * Module parameters. */ @@ -25543,9 +25543,9 @@ diff -Nur linux-3.18.8/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhi ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -diff -Nur linux-3.18.8/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c ---- linux-3.18.8/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2015-03-05 14:40:13.029715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.18.9/drivers/hwmon/bcm2835-hwmon.c +--- linux-3.18.9.orig/drivers/hwmon/bcm2835-hwmon.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/hwmon/bcm2835-hwmon.c 2015-03-08 03:38:45.318040942 -0500 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -25766,9 +25766,9 @@ diff -Nur linux-3.18.8/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); + +module_platform_driver(bcm2835_hwmon_driver); -diff -Nur linux-3.18.8/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig ---- linux-3.18.8/drivers/hwmon/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/hwmon/Kconfig 2015-03-05 14:40:13.025715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/hwmon/Kconfig linux-3.18.9/drivers/hwmon/Kconfig +--- linux-3.18.9.orig/drivers/hwmon/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/hwmon/Kconfig 2015-03-08 03:38:45.318040942 -0500 @@ -1680,6 +1680,16 @@ This driver provides support for the Ultra45 workstation environmental sensors. @@ -25786,9 +25786,9 @@ diff -Nur linux-3.18.8/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig if ACPI comment "ACPI drivers" -diff -Nur linux-3.18.8/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile ---- linux-3.18.8/drivers/hwmon/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/hwmon/Makefile 2015-03-05 14:40:13.025715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/hwmon/Makefile linux-3.18.9/drivers/hwmon/Makefile +--- linux-3.18.9.orig/drivers/hwmon/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/hwmon/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -153,6 +153,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -25797,9 +25797,9 @@ diff -Nur linux-3.18.8/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile obj-$(CONFIG_PMBUS) += pmbus/ -diff -Nur linux-3.18.8/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.18.8/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2015-03-05 14:40:13.045715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.18.9/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.18.9.orig/drivers/i2c/busses/i2c-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/i2c/busses/i2c-bcm2708.c 2015-03-08 03:38:45.318040942 -0500 @@ -0,0 +1,521 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -26322,9 +26322,9 @@ diff -Nur linux-3.18.8/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/bu +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.18.8/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig ---- linux-3.18.8/drivers/i2c/busses/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/Kconfig 2015-03-05 14:40:13.045715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Kconfig linux-3.18.9/drivers/i2c/busses/Kconfig +--- linux-3.18.9.orig/drivers/i2c/busses/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/i2c/busses/Kconfig 2015-03-08 03:38:45.318040942 -0500 @@ -361,7 +361,7 @@ config I2C_BCM2835 @@ -26360,9 +26360,9 @@ diff -Nur linux-3.18.8/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/K config I2C_BCM_KONA tristate "BCM Kona I2C adapter" depends on ARCH_BCM_MOBILE -diff -Nur linux-3.18.8/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile ---- linux-3.18.8/drivers/i2c/busses/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/Makefile 2015-03-05 14:40:13.045715828 +0100 +diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Makefile linux-3.18.9/drivers/i2c/busses/Makefile +--- linux-3.18.9.orig/drivers/i2c/busses/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/i2c/busses/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -33,6 +33,7 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o @@ -26371,9 +26371,9 @@ diff -Nur linux-3.18.8/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/ obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CADENCE) += i2c-cadence.o obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o -diff -Nur linux-3.18.8/drivers/leds/trigger/Kconfig linux-rpi/drivers/leds/trigger/Kconfig ---- linux-3.18.8/drivers/leds/trigger/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/Kconfig 2015-03-05 14:40:13.401715826 +0100 +diff -Nur linux-3.18.9.orig/drivers/leds/trigger/Kconfig linux-3.18.9/drivers/leds/trigger/Kconfig +--- linux-3.18.9.orig/drivers/leds/trigger/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/leds/trigger/Kconfig 2015-03-08 03:38:45.318040942 -0500 @@ -108,4 +108,11 @@ This enables direct flash/torch on/off by the driver, kernel space. If unsure, say Y. @@ -26386,9 +26386,9 @@ diff -Nur linux-3.18.8/drivers/leds/trigger/Kconfig linux-rpi/drivers/leds/trigg + If unsure, say Y. + endif # LEDS_TRIGGERS -diff -Nur linux-3.18.8/drivers/leds/trigger/ledtrig-input.c linux-rpi/drivers/leds/trigger/ledtrig-input.c ---- linux-3.18.8/drivers/leds/trigger/ledtrig-input.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/ledtrig-input.c 2015-03-05 14:40:13.401715826 +0100 +diff -Nur linux-3.18.9.orig/drivers/leds/trigger/ledtrig-input.c linux-3.18.9/drivers/leds/trigger/ledtrig-input.c +--- linux-3.18.9.orig/drivers/leds/trigger/ledtrig-input.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/leds/trigger/ledtrig-input.c 2015-03-08 03:38:45.318040942 -0500 @@ -0,0 +1,65 @@ +/* + * Set LED GPIO to Input "Trigger" @@ -26455,17 +26455,17 @@ diff -Nur linux-3.18.8/drivers/leds/trigger/ledtrig-input.c linux-rpi/drivers/le +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>"); +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/leds/trigger/Makefile linux-rpi/drivers/leds/trigger/Makefile ---- linux-3.18.8/drivers/leds/trigger/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/Makefile 2015-03-05 14:40:13.401715826 +0100 +diff -Nur linux-3.18.9.orig/drivers/leds/trigger/Makefile linux-3.18.9/drivers/leds/trigger/Makefile +--- linux-3.18.9.orig/drivers/leds/trigger/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/leds/trigger/Makefile 2015-03-08 03:38:45.318040942 -0500 @@ -8,3 +8,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o +obj-$(CONFIG_LEDS_TRIGGER_INPUT) += ledtrig-input.o -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.c +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,1828 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -28295,9 +28295,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,126 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -28425,9 +28425,9 @@ diff -Nur linux-3.18.8/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.8/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c ---- linux-3.18.8/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2015-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/controls.c linux-3.18.9/drivers/media/platform/bcm2835/controls.c +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/controls.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/controls.c 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,1322 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29751,9 +29751,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/controls.c linux-rpi/drive + + return 0; +} -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig ---- linux-3.18.8/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2015-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/Kconfig linux-3.18.9/drivers/media/platform/bcm2835/Kconfig +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/Kconfig 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,25 @@ +# Broadcom VideoCore IV v4l2 camera support + @@ -29780,18 +29780,18 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/ + + +endif # VIDEO_BM2835 -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile ---- linux-3.18.8/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2015-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/Makefile linux-3.18.9/drivers/media/platform/bcm2835/Makefile +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/Makefile 2015-03-08 03:38:45.322040942 -0500 @@ -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.8/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-common.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-common.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-common.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,53 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29846,9 +29846,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/dr + u32 v; +}; + -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-encodings.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-encodings.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,127 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29977,9 +29977,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi +/* @} MmalColorSpace List */ + +#endif /* MMAL_ENCODINGS_H */ -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-common.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-common.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,50 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30031,9 +30031,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rp +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-format.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-format.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,81 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30116,9 +30116,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rp +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,404 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30524,9 +30524,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drive + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-port.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-port.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,107 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30635,9 +30635,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/ + */ + +}; -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-parameters.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-parameters.h 2015-03-08 03:38:45.322040942 -0500 @@ -0,0 +1,656 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -31295,9 +31295,9 @@ diff -Nur linux-3.18.8/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.8/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.c +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-03-08 03:38:45.342040942 -0500 @@ -0,0 +1,1916 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -33215,9 +33215,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/dri + kfree(instance); + return -ENODEV; +} -diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h ---- linux-3.18.8/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-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.h +--- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-03-08 03:38:45.342040942 -0500 @@ -0,0 +1,178 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -33397,10 +33397,10 @@ diff -Nur linux-3.18.8/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/dri + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ -diff -Nur linux-3.18.8/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig ---- linux-3.18.8/drivers/media/platform/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/media/platform/Kconfig 2015-03-05 14:40:13.981715822 +0100 -@@ -126,6 +126,7 @@ +diff -Nur linux-3.18.9.orig/drivers/media/platform/Kconfig linux-3.18.9/drivers/media/platform/Kconfig +--- linux-3.18.9.orig/drivers/media/platform/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/Kconfig 2015-03-08 03:38:45.342040942 -0500 +@@ -124,6 +124,7 @@ source "drivers/media/platform/soc_camera/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/s5p-tv/Kconfig" @@ -33408,9 +33408,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/Kconfig linux-rpi/drivers/media/pl endif # V4L_PLATFORM_DRIVERS -diff -Nur linux-3.18.8/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile ---- linux-3.18.8/drivers/media/platform/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/media/platform/Makefile 2015-03-05 14:40:13.981715822 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/platform/Makefile linux-3.18.9/drivers/media/platform/Makefile +--- linux-3.18.9.orig/drivers/media/platform/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/media/platform/Makefile 2015-03-08 03:38:45.346040942 -0500 @@ -49,4 +49,6 @@ obj-y += omap/ @@ -33418,9 +33418,9 @@ diff -Nur linux-3.18.8/drivers/media/platform/Makefile linux-rpi/drivers/media/p +obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/ + ccflags-y += -I$(srctree)/drivers/media/i2c -diff -Nur linux-3.18.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c ---- linux-3.18.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-05 14:40:14.161715821 +0100 +diff -Nur linux-3.18.9.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.18.9/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +--- linux-3.18.9.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-08 03:38:45.346040942 -0500 @@ -1531,6 +1531,10 @@ &rtl2832u_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, @@ -33432,9 +33432,9 @@ diff -Nur linux-3.18.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03, &rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, -diff -Nur linux-3.18.8/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig ---- linux-3.18.8/drivers/misc/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/misc/Kconfig 2015-03-05 14:40:14.221715820 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/Kconfig linux-3.18.9/drivers/misc/Kconfig +--- linux-3.18.9.orig/drivers/misc/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/misc/Kconfig 2015-03-08 03:38:45.346040942 -0500 @@ -524,6 +524,7 @@ source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/mei/Kconfig" @@ -33443,9 +33443,9 @@ diff -Nur linux-3.18.8/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig source "drivers/misc/mic/Kconfig" source "drivers/misc/genwqe/Kconfig" source "drivers/misc/echo/Kconfig" -diff -Nur linux-3.18.8/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile ---- linux-3.18.8/drivers/misc/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/misc/Makefile 2015-03-05 14:40:14.221715820 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/Makefile linux-3.18.9/drivers/misc/Makefile +--- linux-3.18.9.orig/drivers/misc/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/misc/Makefile 2015-03-08 03:38:45.346040942 -0500 @@ -51,6 +51,7 @@ obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o @@ -33454,9 +33454,9 @@ diff -Nur linux-3.18.8/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile obj-y += mic/ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2015-03-08 03:38:45.350040942 -0500 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33786,9 +33786,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2015-03-08 03:38:45.350040942 -0500 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33994,9 +33994,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2015-03-08 03:38:45.350040942 -0500 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34222,9 +34222,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2015-03-08 03:38:45.354040942 -0500 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34297,9 +34297,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2015-03-08 03:38:45.354040942 -0500 @@ -0,0 +1,175 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34476,9 +34476,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi.h 2015-03-08 03:38:45.354040942 -0500 @@ -0,0 +1,378 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34858,9 +34858,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2015-03-08 03:38:45.354040942 -0500 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34904,9 +34904,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2015-03-08 03:38:45.358040942 -0500 @@ -0,0 +1,562 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35470,9 +35470,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2015-03-08 03:38:45.358040942 -0500 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35516,9 +35516,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,2884 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -38404,9 +38404,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,223 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -38631,9 +38631,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38672,9 +38672,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2014 Broadcom. All rights reserved. @@ -38745,9 +38745,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38869,9 +38869,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38923,9 +38923,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn +void vchiq_call_connected_callbacks(void); + +#endif /* VCHIQ_CONNECTED_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,3934 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -42861,9 +42861,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,712 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -43577,9 +43577,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2015-03-08 03:38:45.362040942 -0500 @@ -0,0 +1,383 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -43964,9 +43964,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu +} + +#endif /* CONFIG_DEBUG_FS */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -44020,9 +44020,9 @@ diff -Nur linux-3.18.8/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.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -44111,9 +44111,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv + return vchiq_build_time; +} +EOF -diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.18.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44155,9 +44155,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li +#include "vchiq_util.h" + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44348,9 +44348,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h + short *peer_version); + +#endif /* VCHIQ_IF_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44483,9 +44483,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 17 + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,458 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44945,9 +44945,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45018,9 +45018,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kill +#define mutex_lock_interruptible mutex_lock_interruptible_killable + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45093,9 +45093,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45155,9 +45155,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,860 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46019,9 +46019,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46175,9 +46175,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46260,9 +46260,9 @@ diff -Nur linux-3.18.8/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.8/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.8/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-03-05 14:40:14.405715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46323,9 +46323,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Nur linux-3.18.8/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig ---- linux-3.18.8/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Kconfig 2015-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Kconfig linux-3.18.9/drivers/misc/vc04_services/Kconfig +--- linux-3.18.9.orig/drivers/misc/vc04_services/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/Kconfig 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,9 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -46336,9 +46336,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc + BCM2708 family of products. + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. -diff -Nur linux-3.18.8/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile ---- linux-3.18.8/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Makefile 2015-03-05 14:40:14.401715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Makefile linux-3.18.9/drivers/misc/vc04_services/Makefile +--- linux-3.18.9.orig/drivers/misc/vc04_services/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/misc/vc04_services/Makefile 2015-03-08 03:38:45.366040942 -0500 @@ -0,0 +1,14 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -46354,9 +46354,9 @@ diff -Nur linux-3.18.8/drivers/misc/vc04_services/Makefile linux-rpi/drivers/mis + +ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 + -diff -Nur linux-3.18.8/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quirks.c ---- linux-3.18.8/drivers/mmc/core/quirks.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/mmc/core/quirks.c 2015-03-05 14:40:14.409715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/mmc/core/quirks.c linux-3.18.9/drivers/mmc/core/quirks.c +--- linux-3.18.9.orig/drivers/mmc/core/quirks.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/mmc/core/quirks.c 2015-03-08 03:38:45.366040942 -0500 @@ -95,5 +95,9 @@ f->vendor_fixup(card, f->data); } @@ -46367,9 +46367,9 @@ diff -Nur linux-3.18.8/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quir + card->quirks |= MMC_QUIRK_BLK_NO_CMD23; } EXPORT_SYMBOL(mmc_fixup_device); -diff -Nur linux-3.18.8/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host/bcm2835-mmc.c ---- linux-3.18.8/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/bcm2835-mmc.c 2015-03-05 14:40:14.409715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/mmc/host/bcm2835-mmc.c linux-3.18.9/drivers/mmc/host/bcm2835-mmc.c +--- linux-3.18.9.orig/drivers/mmc/host/bcm2835-mmc.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/mmc/host/bcm2835-mmc.c 2015-03-08 03:38:45.370040942 -0500 @@ -0,0 +1,1557 @@ +/* + * BCM2835 MMC host driver. @@ -47928,9 +47928,9 @@ diff -Nur linux-3.18.8/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host +MODULE_DESCRIPTION("BCM2835 SDHCI driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); -diff -Nur linux-3.18.8/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig ---- linux-3.18.8/drivers/mmc/host/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/Kconfig 2015-03-05 14:40:14.409715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/mmc/host/Kconfig linux-3.18.9/drivers/mmc/host/Kconfig +--- linux-3.18.9.orig/drivers/mmc/host/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/mmc/host/Kconfig 2015-03-08 03:38:45.370040942 -0500 @@ -281,17 +281,6 @@ If you have a controller with this interface, say Y or M here. @@ -47985,9 +47985,9 @@ diff -Nur linux-3.18.8/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconf config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff -Nur linux-3.18.8/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile ---- linux-3.18.8/drivers/mmc/host/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/Makefile 2015-03-05 14:40:14.409715819 +0100 +diff -Nur linux-3.18.9.orig/drivers/mmc/host/Makefile linux-3.18.9/drivers/mmc/host/Makefile +--- linux-3.18.9.orig/drivers/mmc/host/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/mmc/host/Makefile 2015-03-08 03:38:45.370040942 -0500 @@ -17,6 +17,7 @@ obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o @@ -47996,9 +47996,9 @@ diff -Nur linux-3.18.8/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Make obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o -diff -Nur linux-3.18.8/drivers/net/ethernet/microchip/enc28j60.c linux-rpi/drivers/net/ethernet/microchip/enc28j60.c ---- linux-3.18.8/drivers/net/ethernet/microchip/enc28j60.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/net/ethernet/microchip/enc28j60.c 2015-03-05 14:40:14.717715817 +0100 +diff -Nur linux-3.18.9.orig/drivers/net/ethernet/microchip/enc28j60.c linux-3.18.9/drivers/net/ethernet/microchip/enc28j60.c +--- linux-3.18.9.orig/drivers/net/ethernet/microchip/enc28j60.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/net/ethernet/microchip/enc28j60.c 2015-03-08 03:38:45.370040942 -0500 @@ -1630,10 +1630,21 @@ return 0; } @@ -48021,9 +48021,9 @@ diff -Nur linux-3.18.8/drivers/net/ethernet/microchip/enc28j60.c linux-rpi/drive }, .probe = enc28j60_probe, .remove = enc28j60_remove, -diff -Nur linux-3.18.8/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c ---- linux-3.18.8/drivers/net/usb/smsc95xx.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/net/usb/smsc95xx.c 2015-03-05 14:40:14.813715817 +0100 +diff -Nur linux-3.18.9.orig/drivers/net/usb/smsc95xx.c linux-3.18.9/drivers/net/usb/smsc95xx.c +--- linux-3.18.9.orig/drivers/net/usb/smsc95xx.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/net/usb/smsc95xx.c 2015-03-08 03:38:45.370040942 -0500 @@ -59,6 +59,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -48103,9 +48103,9 @@ diff -Nur linux-3.18.8/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc /* try reading mac address from EEPROM */ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { -diff -Nur linux-3.18.8/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c ---- linux-3.18.8/drivers/of/fdt.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/of/fdt.c 2015-03-05 14:40:15.653715812 +0100 +diff -Nur linux-3.18.9.orig/drivers/of/fdt.c linux-3.18.9/drivers/of/fdt.c +--- linux-3.18.9.orig/drivers/of/fdt.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/of/fdt.c 2015-03-08 03:38:45.370040942 -0500 @@ -901,19 +901,38 @@ /* Retrieve command line */ @@ -48164,9 +48164,9 @@ diff -Nur linux-3.18.8/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c if (!d) return -ENOENT; -diff -Nur linux-3.18.8/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c ---- linux-3.18.8/drivers/pinctrl/pinctrl-bcm2835.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-05 14:40:15.737715811 +0100 +diff -Nur linux-3.18.9.orig/drivers/pinctrl/pinctrl-bcm2835.c linux-3.18.9/drivers/pinctrl/pinctrl-bcm2835.c +--- linux-3.18.9.orig/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-08 03:38:45.370040942 -0500 @@ -47,6 +47,7 @@ #define MODULE_NAME "pinctrl-bcm2835" #define BCM2835_NUM_GPIOS 54 @@ -48304,9 +48304,9 @@ diff -Nur linux-3.18.8/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinct len = strlen(dev_name(pc->dev)) + 16; name = devm_kzalloc(pc->dev, len, GFP_KERNEL); -diff -Nur linux-3.18.8/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307.c ---- linux-3.18.8/drivers/rtc/rtc-ds1307.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/rtc/rtc-ds1307.c 2015-03-05 14:40:15.957715810 +0100 +diff -Nur linux-3.18.9.orig/drivers/rtc/rtc-ds1307.c linux-3.18.9/drivers/rtc/rtc-ds1307.c +--- linux-3.18.9.orig/drivers/rtc/rtc-ds1307.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/rtc/rtc-ds1307.c 2015-03-08 03:38:45.370040942 -0500 @@ -1241,6 +1241,14 @@ return 0; } @@ -48322,9 +48322,9 @@ diff -Nur linux-3.18.8/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307 static struct i2c_driver ds1307_driver = { .driver = { .name = "rtc-ds1307", -diff -Nur linux-3.18.8/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig ---- linux-3.18.8/drivers/spi/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/spi/Kconfig 2015-03-05 14:40:16.297715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/spi/Kconfig linux-3.18.9/drivers/spi/Kconfig +--- linux-3.18.9.orig/drivers/spi/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/spi/Kconfig 2015-03-08 03:38:45.370040942 -0500 @@ -77,7 +77,7 @@ config SPI_BCM2835 @@ -48349,9 +48349,9 @@ diff -Nur linux-3.18.8/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN && !BF60x -diff -Nur linux-3.18.8/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile ---- linux-3.18.8/drivers/spi/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/spi/Makefile 2015-03-05 14:40:16.297715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/spi/Makefile linux-3.18.9/drivers/spi/Makefile +--- linux-3.18.9.orig/drivers/spi/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/spi/Makefile 2015-03-08 03:38:45.370040942 -0500 @@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o @@ -48360,9 +48360,9 @@ diff -Nur linux-3.18.8/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o -diff -Nur linux-3.18.8/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c ---- linux-3.18.8/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/spi/spi-bcm2708.c 2015-03-05 14:40:16.297715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/spi/spi-bcm2708.c linux-3.18.9/drivers/spi/spi-bcm2708.c +--- linux-3.18.9.orig/drivers/spi/spi-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/spi/spi-bcm2708.c 2015-03-08 03:38:45.370040942 -0500 @@ -0,0 +1,635 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -48999,9 +48999,9 @@ diff -Nur linux-3.18.8/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm27 +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_agm1264k-fl.c linux-rpi/drivers/staging/fbtft/fb_agm1264k-fl.c ---- linux-3.18.8/drivers/staging/fbtft/fb_agm1264k-fl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_agm1264k-fl.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_agm1264k-fl.c linux-3.18.9/drivers/staging/fbtft/fb_agm1264k-fl.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_agm1264k-fl.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_agm1264k-fl.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,462 @@ +/* + * FB driver for Two KS0108 LCD controllers in AGM1264K-FL display @@ -49465,9 +49465,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_agm1264k-fl.c linux-rpi/drivers/ +MODULE_DESCRIPTION("Two KS0108 LCD controllers in AGM1264K-FL display"); +MODULE_AUTHOR("ololoshka2871"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_bd663474.c linux-rpi/drivers/staging/fbtft/fb_bd663474.c ---- linux-3.18.8/drivers/staging/fbtft/fb_bd663474.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_bd663474.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_bd663474.c linux-3.18.9/drivers/staging/fbtft/fb_bd663474.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_bd663474.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_bd663474.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,193 @@ +/* + * FB driver for the uPD161704 LCD Controller @@ -49662,9 +49662,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_bd663474.c linux-rpi/drivers/sta +MODULE_DESCRIPTION("FB driver for the uPD161704 LCD Controller"); +MODULE_AUTHOR("Seong-Woo Kim"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8340bn.c linux-rpi/drivers/staging/fbtft/fb_hx8340bn.c ---- linux-3.18.8/drivers/staging/fbtft/fb_hx8340bn.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_hx8340bn.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8340bn.c linux-3.18.9/drivers/staging/fbtft/fb_hx8340bn.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8340bn.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_hx8340bn.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,229 @@ +/* + * FB driver for the HX8340BN LCD Controller @@ -49895,9 +49895,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8340bn.c linux-rpi/drivers/sta +MODULE_DESCRIPTION("FB driver for the HX8340BN LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8347d.c linux-rpi/drivers/staging/fbtft/fb_hx8347d.c ---- linux-3.18.8/drivers/staging/fbtft/fb_hx8347d.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_hx8347d.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8347d.c linux-3.18.9/drivers/staging/fbtft/fb_hx8347d.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8347d.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_hx8347d.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,181 @@ +/* + * FB driver for the HX8347D LCD Controller @@ -50080,9 +50080,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8347d.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the HX8347D LCD Controller"); +MODULE_AUTHOR("Christian Vogelgsang"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8353d.c linux-rpi/drivers/staging/fbtft/fb_hx8353d.c ---- linux-3.18.8/drivers/staging/fbtft/fb_hx8353d.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_hx8353d.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8353d.c linux-3.18.9/drivers/staging/fbtft/fb_hx8353d.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8353d.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_hx8353d.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,166 @@ +/* + * FB driver for the HX8353D LCD Controller @@ -50250,9 +50250,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_hx8353d.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the HX8353D LCD Controller"); +MODULE_AUTHOR("Petr Olivka"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9320.c linux-rpi/drivers/staging/fbtft/fb_ili9320.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9320.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9320.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9320.c linux-3.18.9/drivers/staging/fbtft/fb_ili9320.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9320.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9320.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,234 @@ +/* + * FB driver for the ILI9320 LCD Controller @@ -50488,9 +50488,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9320.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9320 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9325.c linux-rpi/drivers/staging/fbtft/fb_ili9325.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9325.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9325.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9325.c linux-3.18.9/drivers/staging/fbtft/fb_ili9325.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9325.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9325.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,291 @@ +/* + * FB driver for the ILI9325 LCD Controller @@ -50783,9 +50783,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9325.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9325 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9340.c linux-rpi/drivers/staging/fbtft/fb_ili9340.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9340.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9340.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9340.c linux-3.18.9/drivers/staging/fbtft/fb_ili9340.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9340.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9340.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,163 @@ +/* + * FB driver for the ILI9340 LCD Controller @@ -50950,9 +50950,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9340.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9340 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9341.c linux-rpi/drivers/staging/fbtft/fb_ili9341.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9341.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9341.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9341.c linux-3.18.9/drivers/staging/fbtft/fb_ili9341.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9341.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9341.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,179 @@ +/* + * FB driver for the ILI9341 LCD display controller @@ -51133,9 +51133,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9341.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9341 LCD display controller"); +MODULE_AUTHOR("Christian Vogelgsang"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9481.c linux-rpi/drivers/staging/fbtft/fb_ili9481.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9481.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9481.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9481.c linux-3.18.9/drivers/staging/fbtft/fb_ili9481.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9481.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9481.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,117 @@ +/* + * FB driver for the ILI9481 LCD Controller @@ -51254,9 +51254,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9481.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9481 LCD Controller"); +MODULE_AUTHOR("Petr Olivka"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9486.c linux-rpi/drivers/staging/fbtft/fb_ili9486.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ili9486.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ili9486.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9486.c linux-3.18.9/drivers/staging/fbtft/fb_ili9486.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9486.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ili9486.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,121 @@ +/* + * FB driver for the ILI9486 LCD Controller @@ -51379,9 +51379,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ili9486.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ILI9486 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_pcd8544.c linux-rpi/drivers/staging/fbtft/fb_pcd8544.c ---- linux-3.18.8/drivers/staging/fbtft/fb_pcd8544.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_pcd8544.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_pcd8544.c linux-3.18.9/drivers/staging/fbtft/fb_pcd8544.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_pcd8544.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_pcd8544.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,177 @@ +/* + * FB driver for the PCD8544 LCD Controller @@ -51560,9 +51560,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_pcd8544.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the PCD8544 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ra8875.c linux-rpi/drivers/staging/fbtft/fb_ra8875.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ra8875.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ra8875.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ra8875.c linux-3.18.9/drivers/staging/fbtft/fb_ra8875.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ra8875.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ra8875.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,331 @@ +/****************************************************************************** + @@ -51895,9 +51895,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ra8875.c linux-rpi/drivers/stagi +MODULE_DESCRIPTION("FB driver for the RA8875 LCD Controller"); +MODULE_AUTHOR("Pf@nne"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_s6d02a1.c linux-rpi/drivers/staging/fbtft/fb_s6d02a1.c ---- linux-3.18.8/drivers/staging/fbtft/fb_s6d02a1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_s6d02a1.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d02a1.c linux-3.18.9/drivers/staging/fbtft/fb_s6d02a1.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d02a1.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_s6d02a1.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,168 @@ +/* + * FB driver for the S6D02A1 LCD Controller @@ -52067,9 +52067,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_s6d02a1.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the S6D02A1 LCD Controller"); +MODULE_AUTHOR("WOLFGANG BUENING"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_s6d1121.c linux-rpi/drivers/staging/fbtft/fb_s6d1121.c ---- linux-3.18.8/drivers/staging/fbtft/fb_s6d1121.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_s6d1121.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d1121.c linux-3.18.9/drivers/staging/fbtft/fb_s6d1121.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d1121.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_s6d1121.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,208 @@ +/* + * FB driver for the S6D1121 LCD Controller @@ -52279,9 +52279,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_s6d1121.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the S6D1121 LCD Controller"); +MODULE_AUTHOR("Roman Rolinsky"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1289.c linux-rpi/drivers/staging/fbtft/fb_ssd1289.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ssd1289.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ssd1289.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1289.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1289.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1289.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1289.c 2015-03-08 03:38:45.374040942 -0500 @@ -0,0 +1,206 @@ +/* + * FB driver for the SSD1289 LCD Controller @@ -52489,9 +52489,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1289.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the SSD1289 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1306.c linux-rpi/drivers/staging/fbtft/fb_ssd1306.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ssd1306.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ssd1306.c 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1306.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1306.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1306.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1306.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,229 @@ +/* + * FB driver for the SSD1306 OLED Controller @@ -52722,9 +52722,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1306.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("SSD1306 OLED Driver"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1331.c linux-rpi/drivers/staging/fbtft/fb_ssd1331.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ssd1331.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ssd1331.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1331.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1331.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1331.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1331.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,205 @@ +#include <linux/module.h> +#include <linux/kernel.h> @@ -52931,9 +52931,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1331.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("SSD1331 OLED Driver"); +MODULE_AUTHOR("Alec Smecher (adapted from SSD1351 by James Davies)"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1351.c linux-rpi/drivers/staging/fbtft/fb_ssd1351.c ---- linux-3.18.8/drivers/staging/fbtft/fb_ssd1351.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_ssd1351.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1351.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1351.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1351.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1351.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,258 @@ +#include <linux/module.h> +#include <linux/kernel.h> @@ -53193,9 +53193,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_ssd1351.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("SSD1351 OLED Driver"); +MODULE_AUTHOR("James Davies"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_st7735r.c linux-rpi/drivers/staging/fbtft/fb_st7735r.c ---- linux-3.18.8/drivers/staging/fbtft/fb_st7735r.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_st7735r.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_st7735r.c linux-3.18.9/drivers/staging/fbtft/fb_st7735r.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_st7735r.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_st7735r.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,195 @@ +/* + * FB driver for the ST7735R LCD Controller @@ -53392,9 +53392,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_st7735r.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-bus.c linux-rpi/drivers/staging/fbtft/fbtft-bus.c ---- linux-3.18.8/drivers/staging/fbtft/fbtft-bus.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft-bus.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-bus.c linux-3.18.9/drivers/staging/fbtft/fbtft-bus.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-bus.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft-bus.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,256 @@ +#include <linux/export.h> +#include <linux/errno.h> @@ -53652,9 +53652,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-bus.c linux-rpi/drivers/stagi + return par->fbtftops.write(par, vmem16, len); +} +EXPORT_SYMBOL(fbtft_write_vmem16_bus16); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-core.c linux-rpi/drivers/staging/fbtft/fbtft-core.c ---- linux-3.18.8/drivers/staging/fbtft/fbtft-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft-core.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-core.c linux-3.18.9/drivers/staging/fbtft/fbtft-core.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-core.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft-core.c 2015-03-08 03:38:45.378040942 -0500 @@ -0,0 +1,1521 @@ +/* + * Copyright (C) 2013 Noralf Tronnes @@ -55177,9 +55177,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-core.c linux-rpi/drivers/stag +EXPORT_SYMBOL(fbtft_remove_common); + +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft_device.c linux-rpi/drivers/staging/fbtft/fbtft_device.c ---- linux-3.18.8/drivers/staging/fbtft/fbtft_device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft_device.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft_device.c linux-3.18.9/drivers/staging/fbtft/fbtft_device.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft_device.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft_device.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,1444 @@ +/* + * @@ -56625,9 +56625,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft_device.c linux-rpi/drivers/st +MODULE_DESCRIPTION("Add a FBTFT device."); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft.h linux-rpi/drivers/staging/fbtft/fbtft.h ---- linux-3.18.8/drivers/staging/fbtft/fbtft.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft.h 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft.h linux-3.18.9/drivers/staging/fbtft/fbtft.h +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft.h 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,447 @@ +/* + * Copyright (C) 2013 Noralf Tronnes @@ -57076,9 +57076,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft.h linux-rpi/drivers/staging/f +} while (0) + +#endif /* __LINUX_FBTFT_H */ -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-io.c linux-rpi/drivers/staging/fbtft/fbtft-io.c ---- linux-3.18.8/drivers/staging/fbtft/fbtft-io.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft-io.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-io.c linux-3.18.9/drivers/staging/fbtft/fbtft-io.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-io.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft-io.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,239 @@ +#include <linux/export.h> +#include <linux/errno.h> @@ -57319,9 +57319,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-io.c linux-rpi/drivers/stagin + return -1; +} +EXPORT_SYMBOL(fbtft_write_gpio16_wr_latched); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-sysfs.c linux-rpi/drivers/staging/fbtft/fbtft-sysfs.c ---- linux-3.18.8/drivers/staging/fbtft/fbtft-sysfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft-sysfs.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-sysfs.c linux-3.18.9/drivers/staging/fbtft/fbtft-sysfs.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-sysfs.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fbtft-sysfs.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,222 @@ +#include "fbtft.h" + @@ -57545,9 +57545,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fbtft-sysfs.c linux-rpi/drivers/sta + if (par->gamma.curves && par->fbtftops.set_gamma) + device_remove_file(par->info->dev, &gamma_device_attrs[0]); +} -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_tinylcd.c linux-rpi/drivers/staging/fbtft/fb_tinylcd.c ---- linux-3.18.8/drivers/staging/fbtft/fb_tinylcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_tinylcd.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tinylcd.c linux-3.18.9/drivers/staging/fbtft/fb_tinylcd.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_tinylcd.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_tinylcd.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,124 @@ +/* + * Custom FB driver for tinylcd.com display @@ -57673,9 +57673,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_tinylcd.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("Custom FB driver for tinylcd.com display"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_tls8204.c linux-rpi/drivers/staging/fbtft/fb_tls8204.c ---- linux-3.18.8/drivers/staging/fbtft/fb_tls8204.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_tls8204.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tls8204.c linux-3.18.9/drivers/staging/fbtft/fb_tls8204.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_tls8204.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_tls8204.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,176 @@ +/* + * FB driver for the TLS8204 LCD Controller @@ -57853,9 +57853,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_tls8204.c linux-rpi/drivers/stag +MODULE_DESCRIPTION("FB driver for the TLS8204 LCD Controller"); +MODULE_AUTHOR("Michael Hope"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_uc1701.c linux-rpi/drivers/staging/fbtft/fb_uc1701.c ---- linux-3.18.8/drivers/staging/fbtft/fb_uc1701.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_uc1701.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_uc1701.c linux-3.18.9/drivers/staging/fbtft/fb_uc1701.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_uc1701.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_uc1701.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,210 @@ +/* + * FB driver for the UC1701 LCD Controller @@ -58067,9 +58067,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_uc1701.c linux-rpi/drivers/stagi +MODULE_DESCRIPTION("FB driver for the UC1701 LCD Controller"); +MODULE_AUTHOR("Juergen Holzmann"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_upd161704.c linux-rpi/drivers/staging/fbtft/fb_upd161704.c ---- linux-3.18.8/drivers/staging/fbtft/fb_upd161704.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_upd161704.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_upd161704.c linux-3.18.9/drivers/staging/fbtft/fb_upd161704.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_upd161704.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_upd161704.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,206 @@ +/* + * FB driver for the uPD161704 LCD Controller @@ -58277,9 +58277,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_upd161704.c linux-rpi/drivers/st +MODULE_DESCRIPTION("FB driver for the uPD161704 LCD Controller"); +MODULE_AUTHOR("Seong-Woo Kim"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_watterott.c linux-rpi/drivers/staging/fbtft/fb_watterott.c ---- linux-3.18.8/drivers/staging/fbtft/fb_watterott.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fb_watterott.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_watterott.c linux-3.18.9/drivers/staging/fbtft/fb_watterott.c +--- linux-3.18.9.orig/drivers/staging/fbtft/fb_watterott.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/fb_watterott.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,324 @@ +/* + * FB driver for the Watterott LCD Controller @@ -58605,9 +58605,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/fb_watterott.c linux-rpi/drivers/st +MODULE_DESCRIPTION("FB driver for the Watterott LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/flexfb.c linux-rpi/drivers/staging/fbtft/flexfb.c ---- linux-3.18.8/drivers/staging/fbtft/flexfb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/flexfb.c 2015-03-05 14:40:16.345715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/flexfb.c linux-3.18.9/drivers/staging/fbtft/flexfb.c +--- linux-3.18.9.orig/drivers/staging/fbtft/flexfb.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/flexfb.c 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,592 @@ +/* + * Generic FB driver for TFT LCD displays @@ -59201,9 +59201,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/flexfb.c linux-rpi/drivers/staging/ +MODULE_DESCRIPTION("Generic FB driver for TFT LCD displays"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/staging/fbtft/Kconfig linux-rpi/drivers/staging/fbtft/Kconfig ---- linux-3.18.8/drivers/staging/fbtft/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/Kconfig 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Kconfig linux-3.18.9/drivers/staging/fbtft/Kconfig +--- linux-3.18.9.orig/drivers/staging/fbtft/Kconfig 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/Kconfig 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,169 @@ +menuconfig FB_TFT + tristate "Support for small TFT LCD display modules" @@ -59374,9 +59374,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/Kconfig linux-rpi/drivers/staging/f +config FB_TFT_FBTFT_DEVICE + tristate "Module to for adding FBTFT devices" + depends on FB_TFT -diff -Nur linux-3.18.8/drivers/staging/fbtft/Makefile linux-rpi/drivers/staging/fbtft/Makefile ---- linux-3.18.8/drivers/staging/fbtft/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/Makefile 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Makefile linux-3.18.9/drivers/staging/fbtft/Makefile +--- linux-3.18.9.orig/drivers/staging/fbtft/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/Makefile 2015-03-08 03:38:45.406040941 -0500 @@ -0,0 +1,34 @@ +# Core module +obj-$(CONFIG_FB_TFT) += fbtft.o @@ -59412,9 +59412,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/Makefile linux-rpi/drivers/staging/ + +# Device modules +obj-$(CONFIG_FB_TFT_FBTFT_DEVICE) += fbtft_device.o -diff -Nur linux-3.18.8/drivers/staging/fbtft/README linux-rpi/drivers/staging/fbtft/README ---- linux-3.18.8/drivers/staging/fbtft/README 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/README 2015-03-05 14:40:16.341715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/README linux-3.18.9/drivers/staging/fbtft/README +--- linux-3.18.9.orig/drivers/staging/fbtft/README 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/fbtft/README 2015-03-08 03:38:45.410040941 -0500 @@ -0,0 +1,32 @@ + FBTFT +========= @@ -59448,9 +59448,9 @@ diff -Nur linux-3.18.8/drivers/staging/fbtft/README linux-rpi/drivers/staging/fb + + +Source: https://github.com/notro/fbtft/ -diff -Nur linux-3.18.8/drivers/staging/Kconfig linux-rpi/drivers/staging/Kconfig ---- linux-3.18.8/drivers/staging/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/staging/Kconfig 2015-03-05 14:40:16.309715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/Kconfig linux-3.18.9/drivers/staging/Kconfig +--- linux-3.18.9.orig/drivers/staging/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/staging/Kconfig 2015-03-08 03:38:45.410040941 -0500 @@ -108,4 +108,6 @@ source "drivers/staging/unisys/Kconfig" @@ -59458,17 +59458,17 @@ diff -Nur linux-3.18.8/drivers/staging/Kconfig linux-rpi/drivers/staging/Kconfig +source "drivers/staging/fbtft/Kconfig" + endif # STAGING -diff -Nur linux-3.18.8/drivers/staging/Makefile linux-rpi/drivers/staging/Makefile ---- linux-3.18.8/drivers/staging/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/staging/Makefile 2015-03-05 14:40:16.309715808 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/Makefile linux-3.18.9/drivers/staging/Makefile +--- linux-3.18.9.orig/drivers/staging/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/staging/Makefile 2015-03-08 03:38:45.410040941 -0500 @@ -46,3 +46,4 @@ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ obj-$(CONFIG_UNISYSSPAR) += unisys/ +obj-$(CONFIG_FB_TFT) += fbtft/ -diff -Nur linux-3.18.8/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig ---- linux-3.18.8/drivers/staging/media/lirc/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/Kconfig 2015-03-05 14:40:16.401715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Kconfig linux-3.18.9/drivers/staging/media/lirc/Kconfig +--- linux-3.18.9.orig/drivers/staging/media/lirc/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/staging/media/lirc/Kconfig 2015-03-08 03:38:45.410040941 -0500 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -59482,9 +59482,9 @@ diff -Nur linux-3.18.8/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/stag config LIRC_SASEM tristate "Sasem USB IR Remote" depends on LIRC && USB -diff -Nur linux-3.18.8/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c ---- linux-3.18.8/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-03-05 14:40:16.401715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.18.9/drivers/staging/media/lirc/lirc_rpi.c +--- linux-3.18.9.orig/drivers/staging/media/lirc/lirc_rpi.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/staging/media/lirc/lirc_rpi.c 2015-03-08 03:38:45.410040941 -0500 @@ -0,0 +1,765 @@ +/* + * lirc_rpi.c @@ -60251,9 +60251,9 @@ diff -Nur linux-3.18.8/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Nur linux-3.18.8/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile ---- linux-3.18.8/drivers/staging/media/lirc/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/Makefile 2015-03-05 14:40:16.401715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Makefile linux-3.18.9/drivers/staging/media/lirc/Makefile +--- linux-3.18.9.orig/drivers/staging/media/lirc/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/staging/media/lirc/Makefile 2015-03-08 03:38:45.410040941 -0500 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -60262,9 +60262,9 @@ diff -Nur linux-3.18.8/drivers/staging/media/lirc/Makefile linux-rpi/drivers/sta obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o obj-$(CONFIG_LIRC_SIR) += lirc_sir.o -diff -Nur linux-3.18.8/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c ---- linux-3.18.8/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2015-03-05 14:40:16.489715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/thermal/bcm2835-thermal.c linux-3.18.9/drivers/thermal/bcm2835-thermal.c +--- linux-3.18.9.orig/drivers/thermal/bcm2835-thermal.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/thermal/bcm2835-thermal.c 2015-03-08 03:38:45.410040941 -0500 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -60450,9 +60450,9 @@ diff -Nur linux-3.18.8/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/therm +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); + +module_platform_driver(bcm2835_thermal_driver); -diff -Nur linux-3.18.8/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig ---- linux-3.18.8/drivers/thermal/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/thermal/Kconfig 2015-03-05 14:40:16.489715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/thermal/Kconfig linux-3.18.9/drivers/thermal/Kconfig +--- linux-3.18.9.orig/drivers/thermal/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/thermal/Kconfig 2015-03-08 03:38:45.410040941 -0500 @@ -206,6 +206,12 @@ enforce idle time which results in more package C-state residency. The user interface is exposed via generic thermal framework. @@ -60466,9 +60466,9 @@ diff -Nur linux-3.18.8/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig config X86_PKG_TEMP_THERMAL tristate "X86 package temperature thermal driver" depends on X86_THERMAL_VECTOR -diff -Nur linux-3.18.8/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile ---- linux-3.18.8/drivers/thermal/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/thermal/Makefile 2015-03-05 14:40:16.489715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/thermal/Makefile linux-3.18.9/drivers/thermal/Makefile +--- linux-3.18.9.orig/drivers/thermal/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/thermal/Makefile 2015-03-08 03:38:45.410040941 -0500 @@ -29,6 +29,7 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o @@ -60477,9 +60477,9 @@ diff -Nur linux-3.18.8/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefi obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ -diff -Nur linux-3.18.8/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c ---- linux-3.18.8/drivers/tty/serial/amba-pl011.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/tty/serial/amba-pl011.c 2015-03-05 14:40:16.505715807 +0100 +diff -Nur linux-3.18.9.orig/drivers/tty/serial/amba-pl011.c linux-3.18.9/drivers/tty/serial/amba-pl011.c +--- linux-3.18.9.orig/drivers/tty/serial/amba-pl011.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/tty/serial/amba-pl011.c 2015-03-08 03:38:45.410040941 -0500 @@ -58,6 +58,7 @@ #include <linux/pinctrl/consumer.h> #include <linux/sizes.h> @@ -60787,9 +60787,9 @@ diff -Nur linux-3.18.8/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/ser pl011_dma_probe(&dev->dev, uap); /* Ensure interrupts from this UART are masked and cleared */ -diff -Nur linux-3.18.8/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c ---- linux-3.18.8/drivers/usb/core/generic.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/core/generic.c 2015-03-05 14:40:16.529715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/core/generic.c linux-3.18.9/drivers/usb/core/generic.c +--- linux-3.18.9.orig/drivers/usb/core/generic.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/core/generic.c 2015-03-08 03:38:45.410040941 -0500 @@ -152,6 +152,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -60798,9 +60798,9 @@ diff -Nur linux-3.18.8/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/gen } return i; } -diff -Nur linux-3.18.8/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c ---- linux-3.18.8/drivers/usb/core/hub.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/core/hub.c 2015-03-05 14:40:16.533715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/core/hub.c linux-3.18.9/drivers/usb/core/hub.c +--- linux-3.18.9.orig/drivers/usb/core/hub.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/core/hub.c 2015-03-08 03:38:45.410040941 -0500 @@ -4923,7 +4923,7 @@ if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -60810,10 +60810,10 @@ diff -Nur linux-3.18.8/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); msleep(100); /* Cool down */ -diff -Nur linux-3.18.8/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c ---- linux-3.18.8/drivers/usb/core/message.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/core/message.c 2015-03-05 14:40:16.533715806 +0100 -@@ -1889,6 +1889,85 @@ +diff -Nur linux-3.18.9.orig/drivers/usb/core/message.c linux-3.18.9/drivers/usb/core/message.c +--- linux-3.18.9.orig/drivers/usb/core/message.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/core/message.c 2015-03-08 03:38:45.414040941 -0500 +@@ -1872,6 +1872,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); @@ -60899,9 +60899,9 @@ diff -Nur linux-3.18.8/drivers/usb/core/message.c linux-rpi/drivers/usb/core/mes /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Nur linux-3.18.8/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h ---- linux-3.18.8/drivers/usb/core/otg_whitelist.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/core/otg_whitelist.h 2015-03-05 14:40:16.533715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/core/otg_whitelist.h linux-3.18.9/drivers/usb/core/otg_whitelist.h +--- linux-3.18.9.orig/drivers/usb/core/otg_whitelist.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/core/otg_whitelist.h 2015-03-08 03:38:45.414040941 -0500 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -61055,9 +61055,9 @@ diff -Nur linux-3.18.8/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/co return 0; } -diff -Nur linux-3.18.8/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c ---- linux-3.18.8/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/gadget/file_storage.c 2015-03-05 14:40:16.541715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/gadget/file_storage.c linux-3.18.9/drivers/usb/gadget/file_storage.c +--- linux-3.18.9.orig/drivers/usb/gadget/file_storage.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/gadget/file_storage.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,3676 @@ +/* + * file_storage.c -- File-backed USB Storage Gadget, for USB development @@ -64735,9 +64735,9 @@ diff -Nur linux-3.18.8/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/g + kref_put(&fsg->ref, fsg_release); +} +module_exit(fsg_cleanup); -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3.18.9/drivers/usb/host/dwc_common_port/changes.txt +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/changes.txt 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/changes.txt 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -64913,9 +64913,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/dr +A DWC_LIBMODULE #define has also been added. If this is not defined, then the +module code in dwc_common_linux.c is not compiled in. This allows linking the +library code directly into a driver module, instead of as a standalone module. -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.18.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -65187,9 +65187,9 @@ diff -Nur linux-3.18.8/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.8/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -65723,9 +65723,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drive +} + +#endif /* DWC_CCLIB */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.h 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,224 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -65951,9 +65951,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drive +#endif + +#endif /* _DWC_CC_H_ */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -67263,9 +67263,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,1434 @@ +#include <linux/kernel.h> +#include <linux/init.h> @@ -68701,9 +68701,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -69980,9 +69980,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -70292,9 +70292,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/d +} + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.h 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -70407,9 +70407,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/d +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.c 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -70702,9 +70702,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drive +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.h 2015-03-08 03:38:45.418040941 -0500 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -70812,9 +70812,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drive +#endif + +#endif /* _DWC_DH_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_list.h 2015-03-08 03:38:45.422040941 -0500 @@ -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 $ */ @@ -71410,9 +71410,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/dri +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_mem.c 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -71659,9 +71659,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/driv +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.c 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -72299,9 +72299,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/d +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.h 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -72337,9 +72337,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/d +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.c 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -72660,9 +72660,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.h 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -72786,9 +72786,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_os.h 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,1276 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -74066,9 +74066,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drive +#endif + +#endif /* _DWC_OS_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -74128,9 +74128,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drive + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.fbsd 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -74149,9 +74149,9 @@ diff -Nur linux-3.18.8/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.8/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.18.8/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-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.linux 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -74202,9 +74202,9 @@ diff -Nur linux-3.18.8/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.8/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.18.9/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/usb.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_common_port/usb.h 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -75152,9 +75152,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/ +#endif + +#endif /* _USB_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.18.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -75380,9 +75380,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/driver +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.18.9/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dummy_audio.c 2015-03-08 03:38:45.422040941 -0500 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -76959,9 +76959,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -77105,9 +77105,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drive +typedef struct cfi_string cfi_string_t; + +#endif -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -77963,9 +77963,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/ +#endif + return 1; +} -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -78047,9 +78047,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/ +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -79261,9 +79261,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -79354,9 +79354,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers +#endif + ); +#endif -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -81234,9 +81234,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/ +} + +#endif //DWC_UTE_CFI -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2015-03-08 03:38:45.426040941 -0500 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -81558,9 +81558,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/ +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2015-03-08 03:38:45.430040941 -0500 @@ -0,0 +1,7141 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -88703,9 +88703,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/ + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -90171,9 +90171,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/ +////////////////////////////////////////////////////////////////////// + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,1594 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -91769,9 +91769,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/dri + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -92478,9 +92478,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/driv +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -92599,9 +92599,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/ + +#endif /*DEBUG*/ +#endif -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,1749 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -94352,9 +94352,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drive + </td></tr> + +*/ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -94442,9 +94442,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drive +#endif + +#endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,1346 @@ +/* + * dwc_otg_fiq_fsm.c - The finite state machine FIQ @@ -95792,9 +95792,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/driv + mb(); + fiq_fsm_spin_unlock(&state->lock); +} -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,367 @@ +/* + * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions @@ -96163,9 +96163,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/driv +extern void dwc_otg_fiq_nop(struct fiq_state *state); + +#endif /* DWC_OTG_FIQ_FSM_H_ */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2015-03-08 03:38:45.434040941 -0500 @@ -0,0 +1,81 @@ +/* + * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ @@ -96248,9 +96248,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/dri +_dwc_otg_fiq_stub_end: +END(_dwc_otg_fiq_stub) + -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2015-03-08 03:38:45.450040941 -0500 @@ -0,0 +1,4244 @@ + +/* ========================================================================== @@ -100496,9 +100496,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2015-03-08 03:38:45.450040941 -0500 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -101632,9 +101632,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/dri +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.18.8/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-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,862 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -102498,9 +102498,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -102919,9 +102919,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drive + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,2713 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -105636,9 +105636,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/dri + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,994 @@ + +/* ========================================================================== @@ -106634,9 +106634,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -107595,9 +107595,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2015-03-08 03:38:45.454040941 -0500 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -107787,9 +107787,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drive + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.18.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2015-03-08 03:38:45.458040941 -0500 @@ -0,0 +1,2712 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -110503,9 +110503,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.18.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2015-03-08 03:38:45.458040941 -0500 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -110773,9 +110773,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/ +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2015-03-08 03:38:45.458040941 -0500 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -111137,9 +111137,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drive +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2015-03-08 03:38:45.462040941 -0500 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -116288,9 +116288,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/dri +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2015-03-08 03:38:45.462040941 -0500 @@ -0,0 +1,1360 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -117652,9 +117652,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/dr +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.18.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2015-03-08 03:38:45.466040941 -0500 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -120206,9 +120206,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers +} gpwrdn_data_t; + +#endif -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile ---- linux-3.18.8/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2015-03-05 14:40:16.557715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/Makefile linux-3.18.9/drivers/usb/host/dwc_otg/Makefile +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/Makefile 2015-03-08 03:38:45.466040941 -0500 @@ -0,0 +1,82 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -120292,9 +120292,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/h + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.18.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2015-03-08 03:38:45.470040941 -0500 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -120633,9 +120633,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/d +); + +1; -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.18.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.18.9/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/test/Makefile 2015-03-08 03:38:45.470040941 -0500 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -120653,9 +120653,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/ + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Nur linux-3.18.8/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.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.18.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2015-03-08 03:38:45.470040941 -0500 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -120790,9 +120790,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.18.8/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-03-05 14:40:16.561715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.18.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2015-03-08 03:38:45.470040941 -0500 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -120987,9 +120987,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/dri + +test_main(); +0; -diff -Nur linux-3.18.8/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig ---- linux-3.18.8/drivers/usb/host/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/host/Kconfig 2015-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/Kconfig linux-3.18.9/drivers/usb/host/Kconfig +--- linux-3.18.9.orig/drivers/usb/host/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/Kconfig 2015-03-08 03:38:45.470040941 -0500 @@ -744,6 +744,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -121010,9 +121010,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconf config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC -diff -Nur linux-3.18.8/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile ---- linux-3.18.8/drivers/usb/host/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/host/Makefile 2015-03-05 14:40:16.553715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/host/Makefile linux-3.18.9/drivers/usb/host/Makefile +--- linux-3.18.9.orig/drivers/usb/host/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/host/Makefile 2015-03-08 03:38:45.470040941 -0500 @@ -71,6 +71,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -121022,9 +121022,9 @@ diff -Nur linux-3.18.8/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Make obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Nur linux-3.18.8/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile ---- linux-3.18.8/drivers/usb/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/usb/Makefile 2015-03-05 14:40:16.525715806 +0100 +diff -Nur linux-3.18.9.orig/drivers/usb/Makefile linux-3.18.9/drivers/usb/Makefile +--- linux-3.18.9.orig/drivers/usb/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/usb/Makefile 2015-03-08 03:38:45.470040941 -0500 @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -121033,9 +121033,9 @@ diff -Nur linux-3.18.8/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ obj-$(CONFIG_USB_FUSBH200_HCD) += host/ -diff -Nur linux-3.18.8/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c ---- linux-3.18.8/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2015-03-05 14:40:16.889715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c linux-3.18.9/drivers/video/fbdev/bcm2708_fb.c +--- linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/video/fbdev/bcm2708_fb.c 2015-03-08 03:38:45.470040941 -0500 @@ -0,0 +1,818 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -121855,9 +121855,9 @@ diff -Nur linux-3.18.8/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/ +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); -diff -Nur linux-3.18.8/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c ---- linux-3.18.8/drivers/video/fbdev/core/cfbimgblt.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2015-03-05 14:40:16.893715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/fbdev/core/cfbimgblt.c linux-3.18.9/drivers/video/fbdev/core/cfbimgblt.c +--- linux-3.18.9.orig/drivers/video/fbdev/core/cfbimgblt.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/video/fbdev/core/cfbimgblt.c 2015-03-08 03:38:45.470040941 -0500 @@ -28,6 +28,11 @@ * * Also need to add code to deal with cards endians that are different than @@ -122031,9 +122031,9 @@ diff -Nur linux-3.18.8/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/vi slow_imageblit(image, p, dst1, fgcolor, bgcolor, start_index, pitch_index); } else -diff -Nur linux-3.18.8/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c ---- linux-3.18.8/drivers/video/fbdev/core/fbmem.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2015-03-05 14:40:16.893715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/fbdev/core/fbmem.c linux-3.18.9/drivers/video/fbdev/core/fbmem.c +--- linux-3.18.9.orig/drivers/video/fbdev/core/fbmem.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/video/fbdev/core/fbmem.c 2015-03-08 03:38:45.470040941 -0500 @@ -1084,6 +1084,25 @@ } EXPORT_SYMBOL(fb_blank); @@ -122092,9 +122092,9 @@ diff -Nur linux-3.18.8/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/ arg = (unsigned long) compat_ptr(arg); case FBIOBLANK: ret = do_fb_ioctl(info, cmd, arg); -diff -Nur linux-3.18.8/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig ---- linux-3.18.8/drivers/video/fbdev/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/Kconfig 2015-03-05 14:40:16.885715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Kconfig linux-3.18.9/drivers/video/fbdev/Kconfig +--- linux-3.18.9.orig/drivers/video/fbdev/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/video/fbdev/Kconfig 2015-03-08 03:38:45.470040941 -0500 @@ -224,6 +224,20 @@ comment "Frame buffer hardware drivers" depends on FB @@ -122116,9 +122116,9 @@ diff -Nur linux-3.18.8/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev config FB_GRVGA tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC -diff -Nur linux-3.18.8/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile ---- linux-3.18.8/drivers/video/fbdev/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/Makefile 2015-03-05 14:40:16.885715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Makefile linux-3.18.9/drivers/video/fbdev/Makefile +--- linux-3.18.9.orig/drivers/video/fbdev/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/video/fbdev/Makefile 2015-03-08 03:38:45.474040941 -0500 @@ -12,6 +12,7 @@ obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o @@ -122127,9 +122127,9 @@ diff -Nur linux-3.18.8/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbde obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711x-fb.o -diff -Nur linux-3.18.8/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.18.8/drivers/video/logo/logo_linux_clut224.ppm 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2015-03-05 14:40:16.933715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.18.9/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.18.9.orig/drivers/video/logo/logo_linux_clut224.ppm 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/video/logo/logo_linux_clut224.ppm 2015-03-08 03:38:45.506040941 -0500 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -124616,9 +124616,9 @@ diff -Nur linux-3.18.8/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drive +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff -Nur linux-3.18.8/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c ---- linux-3.18.8/drivers/w1/masters/w1-gpio.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/w1/masters/w1-gpio.c 2015-03-05 14:40:16.941715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/w1/masters/w1-gpio.c linux-3.18.9/drivers/w1/masters/w1-gpio.c +--- linux-3.18.9.orig/drivers/w1/masters/w1-gpio.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/w1/masters/w1-gpio.c 2015-03-08 03:38:45.506040941 -0500 @@ -23,6 +23,19 @@ #include "../w1.h" #include "../w1_int.h" @@ -124753,9 +124753,9 @@ diff -Nur linux-3.18.8/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters return 0; } -diff -Nur linux-3.18.8/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h ---- linux-3.18.8/drivers/w1/w1.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/w1/w1.h 2015-03-05 14:40:16.945715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/w1/w1.h linux-3.18.9/drivers/w1/w1.h +--- linux-3.18.9.orig/drivers/w1/w1.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/w1/w1.h 2015-03-08 03:38:45.506040941 -0500 @@ -171,6 +171,12 @@ u8 (*set_pullup)(void *, int); @@ -124769,9 +124769,9 @@ diff -Nur linux-3.18.8/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h void (*search)(void *, struct w1_master *, u8, w1_slave_found_callback); }; -diff -Nur linux-3.18.8/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c ---- linux-3.18.8/drivers/w1/w1_int.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/w1/w1_int.c 2015-03-05 14:40:16.945715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/w1/w1_int.c linux-3.18.9/drivers/w1/w1_int.c +--- linux-3.18.9.orig/drivers/w1/w1_int.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/w1/w1_int.c 2015-03-08 03:38:45.506040941 -0500 @@ -123,6 +123,20 @@ return(-EINVAL); } @@ -124793,9 +124793,9 @@ diff -Nur linux-3.18.8/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c /* Lock until the device is added (or not) to w1_masters. */ mutex_lock(&w1_mlock); /* Search for the first available id (starting at 1). */ -diff -Nur linux-3.18.8/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c ---- linux-3.18.8/drivers/w1/w1_io.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/w1/w1_io.c 2015-03-05 14:40:16.945715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/w1/w1_io.c linux-3.18.9/drivers/w1/w1_io.c +--- linux-3.18.9.orig/drivers/w1/w1_io.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/w1/w1_io.c 2015-03-08 03:38:45.506040941 -0500 @@ -134,10 +134,22 @@ static void w1_post_write(struct w1_master *dev) { @@ -124822,9 +124822,9 @@ diff -Nur linux-3.18.8/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -diff -Nur linux-3.18.8/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c ---- linux-3.18.8/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2015-03-05 14:40:17.125715803 +0100 +diff -Nur linux-3.18.9.orig/drivers/watchdog/bcm2708_wdog.c linux-3.18.9/drivers/watchdog/bcm2708_wdog.c +--- linux-3.18.9.orig/drivers/watchdog/bcm2708_wdog.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/drivers/watchdog/bcm2708_wdog.c 2015-03-08 03:38:45.506040941 -0500 @@ -0,0 +1,382 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -125208,9 +125208,9 @@ diff -Nur linux-3.18.8/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdo +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.8/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig ---- linux-3.18.8/drivers/watchdog/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/watchdog/Kconfig 2015-03-05 14:40:16.945715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/watchdog/Kconfig linux-3.18.9/drivers/watchdog/Kconfig +--- linux-3.18.9.orig/drivers/watchdog/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/watchdog/Kconfig 2015-03-08 03:38:45.506040941 -0500 @@ -452,6 +452,12 @@ To compile this driver as a module, choose M here: the module will be called retu_wdt. @@ -125224,9 +125224,9 @@ diff -Nur linux-3.18.8/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconf config MOXART_WDT tristate "MOXART watchdog" depends on ARCH_MOXART -diff -Nur linux-3.18.8/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile ---- linux-3.18.8/drivers/watchdog/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/drivers/watchdog/Makefile 2015-03-05 14:40:16.945715804 +0100 +diff -Nur linux-3.18.9.orig/drivers/watchdog/Makefile linux-3.18.9/drivers/watchdog/Makefile +--- linux-3.18.9.orig/drivers/watchdog/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/drivers/watchdog/Makefile 2015-03-08 03:38:45.510040940 -0500 @@ -56,6 +56,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o @@ -125235,630 +125235,9 @@ diff -Nur linux-3.18.8/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Make obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o -diff -Nur linux-3.18.8/.git/config linux-rpi/.git/config ---- linux-3.18.8/.git/config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/config 2015-03-05 14:40:10.485715843 +0100 -@@ -0,0 +1,12 @@ -+[core] -+ repositoryformatversion = 0 -+ filemode = true -+ bare = false -+ logallrefupdates = true -+[remote "origin"] -+ url = https://github.com/raspberrypi/linux.git -+ fetch = +refs/heads/*:refs/remotes/origin/* -+[branch "rpi-3.18.y"] -+ remote = origin -+ merge = refs/heads/rpi-3.18.y -+ rebase = true -diff -Nur linux-3.18.8/.git/description linux-rpi/.git/description ---- linux-3.18.8/.git/description 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/description 2015-03-05 14:30:30.653719385 +0100 -@@ -0,0 +1 @@ -+Unnamed repository; edit this file 'description' to name the repository. -diff -Nur linux-3.18.8/.git/HEAD linux-rpi/.git/HEAD ---- linux-3.18.8/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/HEAD 2015-03-05 14:40:10.453715844 +0100 -@@ -0,0 +1 @@ -+ref: refs/heads/rpi-3.18.y -diff -Nur linux-3.18.8/.git/hooks/applypatch-msg.sample linux-rpi/.git/hooks/applypatch-msg.sample ---- linux-3.18.8/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/applypatch-msg.sample 2015-03-05 14:30:30.665719385 +0100 -@@ -0,0 +1,15 @@ -+#!/bin/sh -+# -+# An example hook script to check the commit log message taken by -+# applypatch from an e-mail message. -+# -+# The hook should exit with non-zero status after issuing an -+# appropriate message if it wants to stop the commit. The hook is -+# allowed to edit the commit message file. -+# -+# To enable this hook, rename this file to "applypatch-msg". -+ -+. git-sh-setup -+test -x "$GIT_DIR/hooks/commit-msg" && -+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -+: -diff -Nur linux-3.18.8/.git/hooks/commit-msg.sample linux-rpi/.git/hooks/commit-msg.sample ---- linux-3.18.8/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/commit-msg.sample 2015-03-05 14:30:30.661719385 +0100 -@@ -0,0 +1,24 @@ -+#!/bin/sh -+# -+# An example hook script to check the commit log message. -+# Called by "git commit" with one argument, the name of the file -+# that has the commit message. The hook should exit with non-zero -+# status after issuing an appropriate message if it wants to stop the -+# commit. The hook is allowed to edit the commit message file. -+# -+# To enable this hook, rename this file to "commit-msg". -+ -+# Uncomment the below to add a Signed-off-by line to the message. -+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -+# hook is more suited to it. -+# -+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" -+ -+# This example catches duplicate Signed-off-by lines. -+ -+test "" = "$(grep '^Signed-off-by: ' "$1" | -+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { -+ echo >&2 Duplicate Signed-off-by lines. -+ exit 1 -+} -diff -Nur linux-3.18.8/.git/hooks/post-update.sample linux-rpi/.git/hooks/post-update.sample ---- linux-3.18.8/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/post-update.sample 2015-03-05 14:30:30.665719385 +0100 -@@ -0,0 +1,8 @@ -+#!/bin/sh -+# -+# An example hook script to prepare a packed repository for use over -+# dumb transports. -+# -+# To enable this hook, rename this file to "post-update". -+ -+exec git update-server-info -diff -Nur linux-3.18.8/.git/hooks/pre-applypatch.sample linux-rpi/.git/hooks/pre-applypatch.sample ---- linux-3.18.8/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/pre-applypatch.sample 2015-03-05 14:30:30.661719385 +0100 -@@ -0,0 +1,14 @@ -+#!/bin/sh -+# -+# An example hook script to verify what is about to be committed -+# by applypatch from an e-mail message. -+# -+# The hook should exit with non-zero status after issuing an -+# appropriate message if it wants to stop the commit. -+# -+# To enable this hook, rename this file to "pre-applypatch". -+ -+. git-sh-setup -+test -x "$GIT_DIR/hooks/pre-commit" && -+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -+: -diff -Nur linux-3.18.8/.git/hooks/pre-commit.sample linux-rpi/.git/hooks/pre-commit.sample ---- linux-3.18.8/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/pre-commit.sample 2015-03-05 14:30:30.661719385 +0100 -@@ -0,0 +1,49 @@ -+#!/bin/sh -+# -+# An example hook script to verify what is about to be committed. -+# Called by "git commit" with no arguments. The hook should -+# exit with non-zero status after issuing an appropriate message if -+# it wants to stop the commit. -+# -+# To enable this hook, rename this file to "pre-commit". -+ -+if git rev-parse --verify HEAD >/dev/null 2>&1 -+then -+ against=HEAD -+else -+ # Initial commit: diff against an empty tree object -+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -+fi -+ -+# If you want to allow non-ASCII filenames set this variable to true. -+allownonascii=$(git config --bool hooks.allownonascii) -+ -+# Redirect output to stderr. -+exec 1>&2 -+ -+# Cross platform projects tend to avoid non-ASCII filenames; prevent -+# them from being added to the repository. We exploit the fact that the -+# printable range starts at the space character and ends with tilde. -+if [ "$allownonascii" != "true" ] && -+ # Note that the use of brackets around a tr range is ok here, (it's -+ # even required, for portability to Solaris 10's /usr/bin/tr), since -+ # the square bracket bytes happen to fall in the designated range. -+ test $(git diff --cached --name-only --diff-filter=A -z $against | -+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -+then -+ cat <<\EOF -+Error: Attempt to add a non-ASCII file name. -+ -+This can cause problems if you want to work with people on other platforms. -+ -+To be portable it is advisable to rename the file. -+ -+If you know what you are doing you can disable this check using: -+ -+ git config hooks.allownonascii true -+EOF -+ exit 1 -+fi -+ -+# If there are whitespace errors, print the offending file names and fail. -+exec git diff-index --check --cached $against -- -diff -Nur linux-3.18.8/.git/hooks/prepare-commit-msg.sample linux-rpi/.git/hooks/prepare-commit-msg.sample ---- linux-3.18.8/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/prepare-commit-msg.sample 2015-03-05 14:30:30.665719385 +0100 -@@ -0,0 +1,36 @@ -+#!/bin/sh -+# -+# An example hook script to prepare the commit log message. -+# Called by "git commit" with the name of the file that has the -+# commit message, followed by the description of the commit -+# message's source. The hook's purpose is to edit the commit -+# message file. If the hook fails with a non-zero status, -+# the commit is aborted. -+# -+# To enable this hook, rename this file to "prepare-commit-msg". -+ -+# This hook includes three examples. The first comments out the -+# "Conflicts:" part of a merge commit. -+# -+# The second includes the output of "git diff --name-status -r" -+# into the message, just before the "git status" output. It is -+# commented because it doesn't cope with --amend or with squashed -+# commits. -+# -+# The third example adds a Signed-off-by line to the message, that can -+# still be edited. This is rarely a good idea. -+ -+case "$2,$3" in -+ merge,) -+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; -+ -+# ,|template,) -+# /usr/bin/perl -i.bak -pe ' -+# print "\n" . `git diff --cached --name-status -r` -+# if /^#/ && $first++ == 0' "$1" ;; -+ -+ *) ;; -+esac -+ -+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" -diff -Nur linux-3.18.8/.git/hooks/pre-push.sample linux-rpi/.git/hooks/pre-push.sample ---- linux-3.18.8/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/pre-push.sample 2015-03-05 14:30:30.661719385 +0100 -@@ -0,0 +1,54 @@ -+#!/bin/sh -+ -+# An example hook script to verify what is about to be pushed. Called by "git -+# push" after it has checked the remote status, but before anything has been -+# pushed. If this script exits with a non-zero status nothing will be pushed. -+# -+# This hook is called with the following parameters: -+# -+# $1 -- Name of the remote to which the push is being done -+# $2 -- URL to which the push is being done -+# -+# If pushing without using a named remote those arguments will be equal. -+# -+# Information about the commits which are being pushed is supplied as lines to -+# the standard input in the form: -+# -+# <local ref> <local sha1> <remote ref> <remote sha1> -+# -+# This sample shows how to prevent push of commits where the log message starts -+# with "WIP" (work in progress). -+ -+remote="$1" -+url="$2" -+ -+z40=0000000000000000000000000000000000000000 -+ -+IFS=' ' -+while read local_ref local_sha remote_ref remote_sha -+do -+ if [ "$local_sha" = $z40 ] -+ then -+ # Handle delete -+ : -+ else -+ if [ "$remote_sha" = $z40 ] -+ then -+ # New branch, examine all commits -+ range="$local_sha" -+ else -+ # Update to existing branch, examine new commits -+ range="$remote_sha..$local_sha" -+ fi -+ -+ # Check for WIP commit -+ commit=`git rev-list -n 1 --grep '^WIP' "$range"` -+ if [ -n "$commit" ] -+ then -+ echo "Found WIP commit in $local_ref, not pushing" -+ exit 1 -+ fi -+ fi -+done -+ -+exit 0 -diff -Nur linux-3.18.8/.git/hooks/pre-rebase.sample linux-rpi/.git/hooks/pre-rebase.sample ---- linux-3.18.8/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/pre-rebase.sample 2015-03-05 14:30:30.661719385 +0100 -@@ -0,0 +1,169 @@ -+#!/bin/sh -+# -+# Copyright (c) 2006, 2008 Junio C Hamano -+# -+# The "pre-rebase" hook is run just before "git rebase" starts doing -+# its job, and can prevent the command from running by exiting with -+# non-zero status. -+# -+# The hook is called with the following parameters: -+# -+# $1 -- the upstream the series was forked from. -+# $2 -- the branch being rebased (or empty when rebasing the current branch). -+# -+# This sample shows how to prevent topic branches that are already -+# merged to 'next' branch from getting rebased, because allowing it -+# would result in rebasing already published history. -+ -+publish=next -+basebranch="$1" -+if test "$#" = 2 -+then -+ topic="refs/heads/$2" -+else -+ topic=`git symbolic-ref HEAD` || -+ exit 0 ;# we do not interrupt rebasing detached HEAD -+fi -+ -+case "$topic" in -+refs/heads/??/*) -+ ;; -+*) -+ exit 0 ;# we do not interrupt others. -+ ;; -+esac -+ -+# Now we are dealing with a topic branch being rebased -+# on top of master. Is it OK to rebase it? -+ -+# Does the topic really exist? -+git show-ref -q "$topic" || { -+ echo >&2 "No such branch $topic" -+ exit 1 -+} -+ -+# Is topic fully merged to master? -+not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -+if test -z "$not_in_master" -+then -+ echo >&2 "$topic is fully merged to master; better remove it." -+ exit 1 ;# we could allow it, but there is no point. -+fi -+ -+# Is topic ever merged to next? If so you should not be rebasing it. -+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -+only_next_2=`git rev-list ^master ${publish} | sort` -+if test "$only_next_1" = "$only_next_2" -+then -+ not_in_topic=`git rev-list "^$topic" master` -+ if test -z "$not_in_topic" -+ then -+ echo >&2 "$topic is already up-to-date with master" -+ exit 1 ;# we could allow it, but there is no point. -+ else -+ exit 0 -+ fi -+else -+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` -+ /usr/bin/perl -e ' -+ my $topic = $ARGV[0]; -+ my $msg = "* $topic has commits already merged to public branch:\n"; -+ my (%not_in_next) = map { -+ /^([0-9a-f]+) /; -+ ($1 => 1); -+ } split(/\n/, $ARGV[1]); -+ for my $elem (map { -+ /^([0-9a-f]+) (.*)$/; -+ [$1 => $2]; -+ } split(/\n/, $ARGV[2])) { -+ if (!exists $not_in_next{$elem->[0]}) { -+ if ($msg) { -+ print STDERR $msg; -+ undef $msg; -+ } -+ print STDERR " $elem->[1]\n"; -+ } -+ } -+ ' "$topic" "$not_in_next" "$not_in_master" -+ exit 1 -+fi -+ -+<<\DOC_END -+ -+This sample hook safeguards topic branches that have been -+published from being rewound. -+ -+The workflow assumed here is: -+ -+ * Once a topic branch forks from "master", "master" is never -+ merged into it again (either directly or indirectly). -+ -+ * Once a topic branch is fully cooked and merged into "master", -+ it is deleted. If you need to build on top of it to correct -+ earlier mistakes, a new topic branch is created by forking at -+ the tip of the "master". This is not strictly necessary, but -+ it makes it easier to keep your history simple. -+ -+ * Whenever you need to test or publish your changes to topic -+ branches, merge them into "next" branch. -+ -+The script, being an example, hardcodes the publish branch name -+to be "next", but it is trivial to make it configurable via -+$GIT_DIR/config mechanism. -+ -+With this workflow, you would want to know: -+ -+(1) ... if a topic branch has ever been merged to "next". Young -+ topic branches can have stupid mistakes you would rather -+ clean up before publishing, and things that have not been -+ merged into other branches can be easily rebased without -+ affecting other people. But once it is published, you would -+ not want to rewind it. -+ -+(2) ... if a topic branch has been fully merged to "master". -+ Then you can delete it. More importantly, you should not -+ build on top of it -- other people may already want to -+ change things related to the topic as patches against your -+ "master", so if you need further changes, it is better to -+ fork the topic (perhaps with the same name) afresh from the -+ tip of "master". -+ -+Let's look at this example: -+ -+ o---o---o---o---o---o---o---o---o---o "next" -+ / / / / -+ / a---a---b A / / -+ / / / / -+ / / c---c---c---c B / -+ / / / \ / -+ / / / b---b C \ / -+ / / / / \ / -+ ---o---o---o---o---o---o---o---o---o---o---o "master" -+ -+ -+A, B and C are topic branches. -+ -+ * A has one fix since it was merged up to "next". -+ -+ * B has finished. It has been fully merged up to "master" and "next", -+ and is ready to be deleted. -+ -+ * C has not merged to "next" at all. -+ -+We would want to allow C to be rebased, refuse A, and encourage -+B to be deleted. -+ -+To compute (1): -+ -+ git rev-list ^master ^topic next -+ git rev-list ^master next -+ -+ if these match, topic has not merged in next at all. -+ -+To compute (2): -+ -+ git rev-list master..topic -+ -+ if this is empty, it is fully merged to "master". -+ -+DOC_END -diff -Nur linux-3.18.8/.git/hooks/update.sample linux-rpi/.git/hooks/update.sample ---- linux-3.18.8/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/hooks/update.sample 2015-03-05 14:30:30.665719385 +0100 -@@ -0,0 +1,128 @@ -+#!/bin/sh -+# -+# An example hook script to blocks unannotated tags from entering. -+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -+# -+# To enable this hook, rename this file to "update". -+# -+# Config -+# ------ -+# hooks.allowunannotated -+# This boolean sets whether unannotated tags will be allowed into the -+# repository. By default they won't be. -+# hooks.allowdeletetag -+# This boolean sets whether deleting tags will be allowed in the -+# repository. By default they won't be. -+# hooks.allowmodifytag -+# This boolean sets whether a tag may be modified after creation. By default -+# it won't be. -+# hooks.allowdeletebranch -+# This boolean sets whether deleting branches will be allowed in the -+# repository. By default they won't be. -+# hooks.denycreatebranch -+# This boolean sets whether remotely creating branches will be denied -+# in the repository. By default this is allowed. -+# -+ -+# --- Command line -+refname="$1" -+oldrev="$2" -+newrev="$3" -+ -+# --- Safety check -+if [ -z "$GIT_DIR" ]; then -+ echo "Don't run this script from the command line." >&2 -+ echo " (if you want, you could supply GIT_DIR then run" >&2 -+ echo " $0 <ref> <oldrev> <newrev>)" >&2 -+ exit 1 -+fi -+ -+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then -+ echo "usage: $0 <ref> <oldrev> <newrev>" >&2 -+ exit 1 -+fi -+ -+# --- Config -+allowunannotated=$(git config --bool hooks.allowunannotated) -+allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -+denycreatebranch=$(git config --bool hooks.denycreatebranch) -+allowdeletetag=$(git config --bool hooks.allowdeletetag) -+allowmodifytag=$(git config --bool hooks.allowmodifytag) -+ -+# check for no description -+projectdesc=$(sed -e '1q' "$GIT_DIR/description") -+case "$projectdesc" in -+"Unnamed repository"* | "") -+ echo "*** Project description file hasn't been set" >&2 -+ exit 1 -+ ;; -+esac -+ -+# --- Check types -+# if $newrev is 0000...0000, it's a commit to delete a ref. -+zero="0000000000000000000000000000000000000000" -+if [ "$newrev" = "$zero" ]; then -+ newrev_type=delete -+else -+ newrev_type=$(git cat-file -t $newrev) -+fi -+ -+case "$refname","$newrev_type" in -+ refs/tags/*,commit) -+ # un-annotated tag -+ short_refname=${refname##refs/tags/} -+ if [ "$allowunannotated" != "true" ]; then -+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 -+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 -+ exit 1 -+ fi -+ ;; -+ refs/tags/*,delete) -+ # delete tag -+ if [ "$allowdeletetag" != "true" ]; then -+ echo "*** Deleting a tag is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/tags/*,tag) -+ # annotated tag -+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 -+ then -+ echo "*** Tag '$refname' already exists." >&2 -+ echo "*** Modifying a tag is not allowed in this repository." >&2 -+ exit 1 -+ fi -+ ;; -+ refs/heads/*,commit) -+ # branch -+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then -+ echo "*** Creating a branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/heads/*,delete) -+ # delete branch -+ if [ "$allowdeletebranch" != "true" ]; then -+ echo "*** Deleting a branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ refs/remotes/*,commit) -+ # tracking branch -+ ;; -+ refs/remotes/*,delete) -+ # delete tracking branch -+ if [ "$allowdeletebranch" != "true" ]; then -+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2 -+ exit 1 -+ fi -+ ;; -+ *) -+ # Anything else (is there anything else?) -+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 -+ exit 1 -+ ;; -+esac -+ -+# --- Finished -+exit 0 -Binary files linux-3.18.8/.git/index and linux-rpi/.git/index differ -diff -Nur linux-3.18.8/.git/info/exclude linux-rpi/.git/info/exclude ---- linux-3.18.8/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/info/exclude 2015-03-05 14:30:30.665719385 +0100 -@@ -0,0 +1,6 @@ -+# git ls-files --others --exclude-from=.git/info/exclude -+# Lines that start with '#' are comments. -+# For a project mostly in C, the following would be a good set of -+# exclude patterns (uncomment them if you want to use them): -+# *.[oa] -+# *~ -diff -Nur linux-3.18.8/.git/logs/HEAD linux-rpi/.git/logs/HEAD ---- linux-3.18.8/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/logs/HEAD 2015-03-05 14:40:10.473715843 +0100 -@@ -0,0 +1 @@ -+0000000000000000000000000000000000000000 91a03559bbc1b5cb2b1157150c1c698b22716d9a Waldemar Brodkorb <wbrodkorb@conet.de> 1425562810 +0100 clone: from https://github.com/raspberrypi/linux.git -diff -Nur linux-3.18.8/.git/logs/refs/heads/rpi-3.18.y linux-rpi/.git/logs/refs/heads/rpi-3.18.y ---- linux-3.18.8/.git/logs/refs/heads/rpi-3.18.y 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/logs/refs/heads/rpi-3.18.y 2015-03-05 14:40:10.473715843 +0100 -@@ -0,0 +1 @@ -+0000000000000000000000000000000000000000 91a03559bbc1b5cb2b1157150c1c698b22716d9a Waldemar Brodkorb <wbrodkorb@conet.de> 1425562810 +0100 clone: from https://github.com/raspberrypi/linux.git -diff -Nur linux-3.18.8/.git/logs/refs/remotes/origin/HEAD linux-rpi/.git/logs/refs/remotes/origin/HEAD ---- linux-3.18.8/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/logs/refs/remotes/origin/HEAD 2015-03-05 14:40:10.453715844 +0100 -@@ -0,0 +1 @@ -+0000000000000000000000000000000000000000 91a03559bbc1b5cb2b1157150c1c698b22716d9a Waldemar Brodkorb <wbrodkorb@conet.de> 1425562810 +0100 clone: from https://github.com/raspberrypi/linux.git -Binary files linux-3.18.8/.git/objects/pack/pack-adde7c3e99c2b64cc24940bb435fac50f0e72e20.idx and linux-rpi/.git/objects/pack/pack-adde7c3e99c2b64cc24940bb435fac50f0e72e20.idx differ -Binary files linux-3.18.8/.git/objects/pack/pack-adde7c3e99c2b64cc24940bb435fac50f0e72e20.pack and linux-rpi/.git/objects/pack/pack-adde7c3e99c2b64cc24940bb435fac50f0e72e20.pack differ -diff -Nur linux-3.18.8/.git/packed-refs linux-rpi/.git/packed-refs ---- linux-3.18.8/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/packed-refs 2015-03-05 14:40:10.453715844 +0100 -@@ -0,0 +1,20 @@ -+# pack-refs with: peeled fully-peeled -+645fd9b0c0b3c1f79f71f92dac79bd2f87010444 refs/remotes/origin/master -+1b49b450222df26e4abf7abb6d9302f72b2ed386 refs/remotes/origin/rpi-3.10.y -+d894df614c20e2f56ce0ff0576a4c517352684de refs/remotes/origin/rpi-3.10.y-next -+8f768c5f2a3314e4eacce8d667c787f8dadfda74 refs/remotes/origin/rpi-3.11.y -+ee9b8c7d46f2b1787b1e64604acafc70f70191cf refs/remotes/origin/rpi-3.12.y -+a26c4d1f1428082f6aba79207535527c91115c76 refs/remotes/origin/rpi-3.13.y -+2514e943096ff51dd5a83b28b4b4d45ec2693434 refs/remotes/origin/rpi-3.13.y-next -+e294028d7733a30f3befacc41d473c251096a515 refs/remotes/origin/rpi-3.14.y -+8812404b672364ee794411ed19080dc9b6287682 refs/remotes/origin/rpi-3.15.y -+377c82aa1d31b37f1096096b0e4c65beb0bc5c49 refs/remotes/origin/rpi-3.16.y -+a2a6c3e259254f3687bde843f4caff011611cf7e refs/remotes/origin/rpi-3.17.y -+91a03559bbc1b5cb2b1157150c1c698b22716d9a refs/remotes/origin/rpi-3.18.y -+086127cc3f5fa6818a993965f9c753ede3a569da refs/remotes/origin/rpi-3.18.y-rebase -+d4d542c792f6ab98cb76d4ae71a9497e98b20cfa refs/remotes/origin/rpi-3.19.y -+ada8b4415ff44d535d63e4291a0eca733bc2ad0f refs/remotes/origin/rpi-3.2.27 -+2a8d45ec0883e3cbdce920855b3461ac77308a5f refs/remotes/origin/rpi-3.6.y -+d996a1b91b2bf3dc06f4f4f822a56f4496457aa1 refs/remotes/origin/rpi-3.8.y -+d5572370289f698b101f3d0198b1c99f17f0d278 refs/remotes/origin/rpi-3.9.y -+8fa2e19c4fdbe17704947e444674e19ea47c8ddd refs/remotes/origin/rpi-patches -diff -Nur linux-3.18.8/.git/refs/heads/rpi-3.18.y linux-rpi/.git/refs/heads/rpi-3.18.y ---- linux-3.18.8/.git/refs/heads/rpi-3.18.y 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/refs/heads/rpi-3.18.y 2015-03-05 14:40:10.473715843 +0100 -@@ -0,0 +1 @@ -+91a03559bbc1b5cb2b1157150c1c698b22716d9a -diff -Nur linux-3.18.8/.git/refs/remotes/origin/HEAD linux-rpi/.git/refs/remotes/origin/HEAD ---- linux-3.18.8/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/.git/refs/remotes/origin/HEAD 2015-03-05 14:40:10.453715844 +0100 -@@ -0,0 +1 @@ -+ref: refs/remotes/origin/rpi-3.18.y -diff -Nur linux-3.18.8/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h ---- linux-3.18.8/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/broadcom/vc_cma.h 2015-03-05 14:40:17.829715798 +0100 +diff -Nur linux-3.18.9.orig/include/linux/broadcom/vc_cma.h linux-3.18.9/include/linux/broadcom/vc_cma.h +--- linux-3.18.9.orig/include/linux/broadcom/vc_cma.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/include/linux/broadcom/vc_cma.h 2015-03-08 03:38:45.510040940 -0500 @@ -0,0 +1,29 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -125889,9 +125268,9 @@ diff -Nur linux-3.18.8/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/b +#endif + +#endif /* VC_CMA_H */ -diff -Nur linux-3.18.8/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h ---- linux-3.18.8/include/linux/mmc/host.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/include/linux/mmc/host.h 2015-03-05 14:40:18.025715797 +0100 +diff -Nur linux-3.18.9.orig/include/linux/mmc/host.h linux-3.18.9/include/linux/mmc/host.h +--- linux-3.18.9.orig/include/linux/mmc/host.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/include/linux/mmc/host.h 2015-03-08 03:38:45.510040940 -0500 @@ -290,6 +290,7 @@ #define MMC_CAP2_HS400 (MMC_CAP2_HS400_1_8V | \ MMC_CAP2_HS400_1_2V) @@ -125900,9 +125279,9 @@ diff -Nur linux-3.18.8/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host mmc_pm_flag_t pm_caps; /* supported pm features */ -diff -Nur linux-3.18.8/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h ---- linux-3.18.8/include/linux/mmc/sdhci.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/include/linux/mmc/sdhci.h 2015-03-05 14:40:18.025715797 +0100 +diff -Nur linux-3.18.9.orig/include/linux/mmc/sdhci.h linux-3.18.9/include/linux/mmc/sdhci.h +--- linux-3.18.9.orig/include/linux/mmc/sdhci.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/include/linux/mmc/sdhci.h 2015-03-08 03:38:45.510040940 -0500 @@ -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 */ @@ -125911,9 +125290,9 @@ diff -Nur linux-3.18.8/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdh unsigned int version; /* SDHCI spec. version */ -diff -Nur linux-3.18.8/include/linux/platform_data/bcm2708.h linux-rpi/include/linux/platform_data/bcm2708.h ---- linux-3.18.8/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/platform_data/bcm2708.h 2015-03-05 14:40:18.169715796 +0100 +diff -Nur linux-3.18.9.orig/include/linux/platform_data/bcm2708.h linux-3.18.9/include/linux/platform_data/bcm2708.h +--- linux-3.18.9.orig/include/linux/platform_data/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/include/linux/platform_data/bcm2708.h 2015-03-08 03:38:45.514040940 -0500 @@ -0,0 +1,23 @@ +/* + * include/linux/platform_data/bcm2708.h @@ -125938,9 +125317,9 @@ diff -Nur linux-3.18.8/include/linux/platform_data/bcm2708.h linux-rpi/include/l + bcm2708_gpio_pull_t value); + +#endif -diff -Nur linux-3.18.8/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h ---- linux-3.18.8/include/linux/vmstat.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/include/linux/vmstat.h 2015-03-05 14:40:18.249715796 +0100 +diff -Nur linux-3.18.9.orig/include/linux/vmstat.h linux-3.18.9/include/linux/vmstat.h +--- linux-3.18.9.orig/include/linux/vmstat.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/include/linux/vmstat.h 2015-03-08 03:38:45.514040940 -0500 @@ -241,7 +241,11 @@ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -125953,9 +125332,9 @@ diff -Nur linux-3.18.8/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h } static inline void __inc_zone_page_state(struct page *page, -diff -Nur linux-3.18.8/include/linux/w1-gpio.h linux-rpi/include/linux/w1-gpio.h ---- linux-3.18.8/include/linux/w1-gpio.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/include/linux/w1-gpio.h 2015-03-05 14:40:18.249715796 +0100 +diff -Nur linux-3.18.9.orig/include/linux/w1-gpio.h linux-3.18.9/include/linux/w1-gpio.h +--- linux-3.18.9.orig/include/linux/w1-gpio.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/include/linux/w1-gpio.h 2015-03-08 03:38:45.514040940 -0500 @@ -18,6 +18,7 @@ struct w1_gpio_platform_data { unsigned int pin; @@ -125964,9 +125343,9 @@ diff -Nur linux-3.18.8/include/linux/w1-gpio.h linux-rpi/include/linux/w1-gpio.h void (*enable_external_pullup)(int enable); unsigned int ext_pullup_enable_pin; unsigned int pullup_duration; -diff -Nur linux-3.18.8/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h ---- linux-3.18.8/include/uapi/linux/fb.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/include/uapi/linux/fb.h 2015-03-05 14:40:18.293715796 +0100 +diff -Nur linux-3.18.9.orig/include/uapi/linux/fb.h linux-3.18.9/include/uapi/linux/fb.h +--- linux-3.18.9.orig/include/uapi/linux/fb.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/include/uapi/linux/fb.h 2015-03-08 03:38:45.514040940 -0500 @@ -34,6 +34,11 @@ #define FBIOPUT_MODEINFO 0x4617 #define FBIOGET_DISPINFO 0x4618 @@ -125979,9 +125358,9 @@ diff -Nur linux-3.18.8/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ #define FB_TYPE_PLANES 1 /* Non interleaved planes */ -diff -Nur linux-3.18.8/kernel/cgroup.c linux-rpi/kernel/cgroup.c ---- linux-3.18.8/kernel/cgroup.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/kernel/cgroup.c 2015-03-05 14:40:18.445715795 +0100 +diff -Nur linux-3.18.9.orig/kernel/cgroup.c linux-3.18.9/kernel/cgroup.c +--- linux-3.18.9.orig/kernel/cgroup.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/kernel/cgroup.c 2015-03-08 03:38:45.514040940 -0500 @@ -5322,6 +5322,29 @@ } __setup("cgroup_disable=", cgroup_disable); @@ -126012,24 +125391,9 @@ diff -Nur linux-3.18.8/kernel/cgroup.c linux-rpi/kernel/cgroup.c static int __init cgroup_set_legacy_files_on_dfl(char *str) { printk("cgroup: using legacy files on the default hierarchy\n"); -diff -Nur linux-3.18.8/kernel/time/ntp.c linux-rpi/kernel/time/ntp.c ---- linux-3.18.8/kernel/time/ntp.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/kernel/time/ntp.c 2015-03-05 14:40:18.469715795 +0100 -@@ -634,9 +634,9 @@ - return -EPERM; - - if (txc->modes & ADJ_FREQUENCY) { -- if (LONG_MIN / PPM_SCALE > txc->freq) -+ if (LLONG_MIN / PPM_SCALE > txc->freq) - return -EINVAL; -- if (LONG_MAX / PPM_SCALE < txc->freq) -+ if (LLONG_MAX / PPM_SCALE < txc->freq) - return -EINVAL; - } - -diff -Nur linux-3.18.8/mm/memcontrol.c linux-rpi/mm/memcontrol.c ---- linux-3.18.8/mm/memcontrol.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/mm/memcontrol.c 2015-03-05 14:40:18.497715794 +0100 +diff -Nur linux-3.18.9.orig/mm/memcontrol.c linux-3.18.9/mm/memcontrol.c +--- linux-3.18.9.orig/mm/memcontrol.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/mm/memcontrol.c 2015-03-08 03:38:45.518040940 -0500 @@ -6207,6 +6207,7 @@ .bind = mem_cgroup_bind, .legacy_cftypes = mem_cgroup_files, @@ -126038,9 +125402,9 @@ diff -Nur linux-3.18.8/mm/memcontrol.c linux-rpi/mm/memcontrol.c }; #ifdef CONFIG_MEMCG_SWAP -diff -Nur linux-3.18.8/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c ---- linux-3.18.8/scripts/dtc/checks.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/checks.c 2015-03-05 14:40:18.909715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/checks.c linux-3.18.9/scripts/dtc/checks.c +--- linux-3.18.9.orig/scripts/dtc/checks.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/checks.c 2015-03-08 03:38:45.518040940 -0500 @@ -53,7 +53,7 @@ void *data; bool warn, error; @@ -126293,9 +125657,9 @@ diff -Nur linux-3.18.8/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c { struct node *dt = bi->dt; int i; -diff -Nur linux-3.18.8/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c ---- linux-3.18.8/scripts/dtc/data.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/data.c 2015-03-05 14:40:18.909715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/data.c linux-3.18.9/scripts/dtc/data.c +--- linux-3.18.9.orig/scripts/dtc/data.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/data.c 2015-03-08 03:38:45.518040940 -0500 @@ -74,7 +74,7 @@ struct data d; char *q; @@ -126331,9 +125695,9 @@ diff -Nur linux-3.18.8/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c - return 1; + return true; } -diff -Nur linux-3.18.8/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c ---- linux-3.18.8/scripts/dtc/dtc.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.c linux-3.18.9/scripts/dtc/dtc.c +--- linux-3.18.9.orig/scripts/dtc/dtc.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc.c 2015-03-08 03:38:45.518040940 -0500 @@ -29,6 +29,7 @@ int minsize; /* Minimum blob size */ int padsize; /* Additional padding to blob */ @@ -126429,9 +125793,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c if (! outf) die("Couldn't open output file %s: %s\n", outname, strerror(errno)); -diff -Nur linux-3.18.8/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h ---- linux-3.18.8/scripts/dtc/dtc.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc.h 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.h linux-3.18.9/scripts/dtc/dtc.h +--- linux-3.18.9.orig/scripts/dtc/dtc.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc.h 2015-03-08 03:38:45.518040940 -0500 @@ -38,9 +38,9 @@ #include "util.h" @@ -126557,9 +125921,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h /* Flattened trees */ -diff -Nur linux-3.18.8/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l ---- linux-3.18.8/scripts/dtc/dtc-lexer.l 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-lexer.l 2015-03-05 14:40:18.909715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.l linux-3.18.9/scripts/dtc/dtc-lexer.l +--- linux-3.18.9.orig/scripts/dtc/dtc-lexer.l 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc-lexer.l 2015-03-08 03:38:45.518040940 -0500 @@ -20,7 +20,6 @@ %option noyywrap nounput noinput never-interactive @@ -126697,9 +126061,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l + + treesource_error = true; } -diff -Nur linux-3.18.8/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped ---- linux-3.18.8/scripts/dtc/dtc-lexer.lex.c_shipped 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.lex.c_shipped linux-3.18.9/scripts/dtc/dtc-lexer.lex.c_shipped +--- linux-3.18.9.orig/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-08 03:38:45.518040940 -0500 @@ -372,8 +372,8 @@ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -127554,9 +126918,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc + treesource_error = true; } -diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped ---- linux-3.18.8/scripts/dtc/dtc-parser.tab.c_shipped 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.c_shipped linux-3.18.9/scripts/dtc/dtc-parser.tab.c_shipped +--- linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-08 03:38:45.522040940 -0500 @@ -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. */ @@ -130226,9 +129590,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dt - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped ---- linux-3.18.8/scripts/dtc/dtc-parser.tab.h_shipped 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.h_shipped linux-3.18.9/scripts/dtc/dtc-parser.tab.h_shipped +--- linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-08 03:38:45.522040940 -0500 @@ -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. */ @@ -130400,9 +129764,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dt -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */ -diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser.y ---- linux-3.18.8/scripts/dtc/dtc-parser.y 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.y 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.y linux-3.18.9/scripts/dtc/dtc-parser.y +--- linux-3.18.9.orig/scripts/dtc/dtc-parser.y 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/dtc-parser.y 2015-03-08 03:38:45.522040940 -0500 @@ -17,31 +17,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA @@ -130677,9 +130041,9 @@ diff -Nur linux-3.18.8/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-3.18.8/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c ---- linux-3.18.8/scripts/dtc/flattree.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/flattree.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/flattree.c linux-3.18.9/scripts/dtc/flattree.c +--- linux-3.18.9.orig/scripts/dtc/flattree.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/flattree.c 2015-03-08 03:38:45.522040940 -0500 @@ -261,7 +261,13 @@ { struct property *prop; @@ -130847,9 +130211,9 @@ diff -Nur linux-3.18.8/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c emit->endnode(etarget, tree->labels); } -diff -Nur linux-3.18.8/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c ---- linux-3.18.8/scripts/dtc/fstree.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/fstree.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/fstree.c linux-3.18.9/scripts/dtc/fstree.c +--- linux-3.18.9.orig/scripts/dtc/fstree.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/fstree.c 2015-03-08 03:38:45.522040940 -0500 @@ -37,26 +37,26 @@ tree = build_node(NULL, NULL); @@ -130898,9 +130262,9 @@ diff -Nur linux-3.18.8/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c } closedir(d); -diff -Nur linux-3.18.8/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c ---- linux-3.18.8/scripts/dtc/livetree.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/livetree.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/livetree.c linux-3.18.9/scripts/dtc/livetree.c +--- linux-3.18.9.orig/scripts/dtc/livetree.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/livetree.c 2015-03-08 03:38:45.522040940 -0500 @@ -511,7 +511,9 @@ struct node *get_node_by_ref(struct node *tree, const char *ref) @@ -130912,9 +130276,9 @@ diff -Nur linux-3.18.8/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c return get_node_by_path(tree, ref); else return get_node_by_label(tree, ref); -diff -Nur linux-3.18.8/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c ---- linux-3.18.8/scripts/dtc/srcpos.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/srcpos.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.c linux-3.18.9/scripts/dtc/srcpos.c +--- linux-3.18.9.orig/scripts/dtc/srcpos.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/srcpos.c 2015-03-08 03:38:45.522040940 -0500 @@ -34,7 +34,7 @@ static struct search_path *search_path_head, **search_path_tail; @@ -131015,9 +130379,9 @@ diff -Nur linux-3.18.8/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c va_end(va); } -diff -Nur linux-3.18.8/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h ---- linux-3.18.8/scripts/dtc/srcpos.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/srcpos.h 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.h linux-3.18.9/scripts/dtc/srcpos.h +--- linux-3.18.9.orig/scripts/dtc/srcpos.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/srcpos.h 2015-03-08 03:38:45.522040940 -0500 @@ -21,6 +21,7 @@ #define _SRCPOS_H_ @@ -131054,9 +130418,9 @@ diff -Nur linux-3.18.8/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h extern void srcpos_set_line(char *f, int l); -diff -Nur linux-3.18.8/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource.c ---- linux-3.18.8/scripts/dtc/treesource.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/treesource.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/treesource.c linux-3.18.9/scripts/dtc/treesource.c +--- linux-3.18.9.orig/scripts/dtc/treesource.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/treesource.c 2015-03-08 03:38:45.522040940 -0500 @@ -26,12 +26,12 @@ extern YYLTYPE yylloc; @@ -131111,9 +130475,9 @@ diff -Nur linux-3.18.8/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource if ((const void *)bp >= propend) break; fprintf(f, " "); -diff -Nur linux-3.18.8/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c ---- linux-3.18.8/scripts/dtc/util.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/util.c 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/util.c linux-3.18.9/scripts/dtc/util.c +--- linux-3.18.9.orig/scripts/dtc/util.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/util.c 2015-03-08 03:38:45.522040940 -0500 @@ -39,11 +39,11 @@ char *xstrdup(const char *s) { @@ -131170,9 +130534,9 @@ diff -Nur linux-3.18.8/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c printf(">"); } else { printf(" = ["); -diff -Nur linux-3.18.8/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h ---- linux-3.18.8/scripts/dtc/util.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/util.h 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/util.h linux-3.18.9/scripts/dtc/util.h +--- linux-3.18.9.orig/scripts/dtc/util.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/util.h 2015-03-08 03:38:45.526040940 -0500 @@ -2,6 +2,7 @@ #define _UTIL_H @@ -131198,15 +130562,15 @@ diff -Nur linux-3.18.8/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h /* * Parse an escaped character starting at index i in string s. The resulting -diff -Nur linux-3.18.8/scripts/dtc/version_gen.h linux-rpi/scripts/dtc/version_gen.h ---- linux-3.18.8/scripts/dtc/version_gen.h 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/scripts/dtc/version_gen.h 2015-03-05 14:40:18.913715792 +0100 +diff -Nur linux-3.18.9.orig/scripts/dtc/version_gen.h linux-3.18.9/scripts/dtc/version_gen.h +--- linux-3.18.9.orig/scripts/dtc/version_gen.h 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/scripts/dtc/version_gen.h 2015-03-08 03:38:45.526040940 -0500 @@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.0-dirty" +#define DTC_VERSION "DTC 1.4.1-g36c70742" -diff -Nur linux-3.18.8/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c ---- linux-3.18.8/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.c 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.c linux-3.18.9/sound/arm/bcm2835.c +--- linux-3.18.9.orig/sound/arm/bcm2835.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/bcm2835.c 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,420 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -131628,9 +130992,9 @@ diff -Nur linux-3.18.8/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Nur linux-3.18.8/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c ---- linux-3.18.8/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-ctl.c 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-ctl.c linux-3.18.9/sound/arm/bcm2835-ctl.c +--- linux-3.18.9.orig/sound/arm/bcm2835-ctl.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/bcm2835-ctl.c 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,323 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -131955,9 +131319,9 @@ diff -Nur linux-3.18.8/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c + } + return 0; +} -diff -Nur linux-3.18.8/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h ---- linux-3.18.8/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.h 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.h linux-3.18.9/sound/arm/bcm2835.h +--- linux-3.18.9.orig/sound/arm/bcm2835.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/bcm2835.h 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,167 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -132126,9 +131490,9 @@ diff -Nur linux-3.18.8/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Nur linux-3.18.8/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c ---- linux-3.18.8/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-pcm.c 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-pcm.c linux-3.18.9/sound/arm/bcm2835-pcm.c +--- linux-3.18.9.orig/sound/arm/bcm2835-pcm.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/bcm2835-pcm.c 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,552 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -132682,9 +132046,9 @@ diff -Nur linux-3.18.8/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c + + return 0; +} -diff -Nur linux-3.18.8/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c ---- linux-3.18.8/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-vchiq.c 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-vchiq.c linux-3.18.9/sound/arm/bcm2835-vchiq.c +--- linux-3.18.9.orig/sound/arm/bcm2835-vchiq.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/bcm2835-vchiq.c 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,902 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -133588,9 +132952,9 @@ diff -Nur linux-3.18.8/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vch + +module_param(force_bulk, bool, 0444); +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); -diff -Nur linux-3.18.8/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig ---- linux-3.18.8/sound/arm/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/arm/Kconfig 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/Kconfig linux-3.18.9/sound/arm/Kconfig +--- linux-3.18.9.orig/sound/arm/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/arm/Kconfig 2015-03-08 03:38:45.526040940 -0500 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -133604,9 +132968,9 @@ diff -Nur linux-3.18.8/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig + endif # SND_ARM -diff -Nur linux-3.18.8/sound/arm/Makefile linux-rpi/sound/arm/Makefile ---- linux-3.18.8/sound/arm/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/arm/Makefile 2015-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/Makefile linux-3.18.9/sound/arm/Makefile +--- linux-3.18.9.orig/sound/arm/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/arm/Makefile 2015-03-08 03:38:45.526040940 -0500 @@ -14,3 +14,8 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -133616,9 +132980,9 @@ diff -Nur linux-3.18.8/sound/arm/Makefile linux-rpi/sound/arm/Makefile +snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o + +ccflags-y += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff -Nur linux-3.18.8/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.18.8/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-03-05 14:40:19.021715791 +0100 +diff -Nur linux-3.18.9.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.18.9/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.18.9.orig/sound/arm/vc_vchi_audioserv_defs.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/arm/vc_vchi_audioserv_defs.h 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -133736,9 +133100,9 @@ diff -Nur linux-3.18.8/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Nur linux-3.18.8/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c ---- linux-3.18.8/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2015-03-05 14:40:19.313715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.18.9/sound/soc/bcm/bcm2708-i2s.c +--- linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/bcm2708-i2s.c 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,1009 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC @@ -134749,9 +134113,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm27 +MODULE_DESCRIPTION("BCM2708 I2S interface"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm2708-i2s.h ---- linux-3.18.8/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.h 2015-03-05 14:40:19.313715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.h linux-3.18.9/sound/soc/bcm/bcm2708-i2s.h +--- linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/bcm2708-i2s.h 2015-03-08 03:38:45.526040940 -0500 @@ -0,0 +1,35 @@ +/* + * I2S configuration for sound cards. @@ -134788,9 +134152,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm27 +extern void bcm2708_i2s_set_gpio(int gpio); + +#endif -diff -Nur linux-3.18.8/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm2835-i2s.c ---- linux-3.18.8/sound/soc/bcm/bcm2835-i2s.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2835-i2s.c 2015-03-05 14:40:19.313715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2835-i2s.c linux-3.18.9/sound/soc/bcm/bcm2835-i2s.c +--- linux-3.18.9.orig/sound/soc/bcm/bcm2835-i2s.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/bcm2835-i2s.c 2015-03-08 03:38:45.530040940 -0500 @@ -861,6 +861,7 @@ { .compatible = "brcm,bcm2835-i2s", }, {}, @@ -134799,9 +134163,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm28 static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, -diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hifiberry_amp.c ---- linux-3.18.8/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_amp.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_amp.c linux-3.18.9/sound/soc/bcm/hifiberry_amp.c +--- linux-3.18.9.orig/sound/soc/bcm/hifiberry_amp.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/hifiberry_amp.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,127 @@ +/* + * ASoC Driver for HifiBerry AMP @@ -134930,9 +134294,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for HiFiBerry-AMP"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c ---- linux-3.18.8/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dac.c linux-3.18.9/sound/soc/bcm/hifiberry_dac.c +--- linux-3.18.9.orig/sound/soc/bcm/hifiberry_dac.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/hifiberry_dac.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,122 @@ +/* + * ASoC Driver for HifiBerry DAC @@ -135056,9 +134420,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm/hifiberry_dacplus.c ---- linux-3.18.8/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_dacplus.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dacplus.c linux-3.18.9/sound/soc/bcm/hifiberry_dacplus.c +--- linux-3.18.9.orig/sound/soc/bcm/hifiberry_dacplus.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/hifiberry_dacplus.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,141 @@ +/* + * ASoC Driver for HiFiBerry DAC+ @@ -135201,9 +134565,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>"); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c ---- linux-3.18.8/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c linux-3.18.9/sound/soc/bcm/hifiberry_digi.c +--- linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/hifiberry_digi.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,203 @@ +/* + * ASoC Driver for HifiBerry Digi @@ -135408,9 +134772,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hi +MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c ---- linux-3.18.8/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c linux-3.18.9/sound/soc/bcm/iqaudio-dac.c +--- linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/iqaudio-dac.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,127 @@ +/* + * ASoC Driver for IQaudIO DAC @@ -135539,9 +134903,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaud +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig ---- linux-3.18.8/sound/soc/bcm/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/Kconfig 2015-03-05 14:40:19.313715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/Kconfig linux-3.18.9/sound/soc/bcm/Kconfig +--- linux-3.18.9.orig/sound/soc/bcm/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/Kconfig 2015-03-08 03:38:45.530040940 -0500 @@ -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 @@ -135599,9 +134963,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig + select SND_SOC_PCM512x_I2C + help + Say Y or M if you want to add support for IQaudIO-DAC. -diff -Nur linux-3.18.8/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile ---- linux-3.18.8/sound/soc/bcm/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/Makefile 2015-03-05 14:40:19.313715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/Makefile linux-3.18.9/sound/soc/bcm/Makefile +--- linux-3.18.9.orig/sound/soc/bcm/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/Makefile 2015-03-08 03:38:45.530040940 -0500 @@ -3,3 +3,22 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o @@ -135625,9 +134989,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o +obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o +obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o -diff -Nur linux-3.18.8/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c ---- linux-3.18.8/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/rpi-dac.c 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/bcm/rpi-dac.c linux-3.18.9/sound/soc/bcm/rpi-dac.c +--- linux-3.18.9.orig/sound/soc/bcm/rpi-dac.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/bcm/rpi-dac.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,97 @@ +/* + * ASoC Driver for RPi-DAC. @@ -135726,9 +135090,9 @@ diff -Nur linux-3.18.8/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig ---- linux-3.18.8/sound/soc/codecs/Kconfig 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/Kconfig 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/Kconfig linux-3.18.9/sound/soc/codecs/Kconfig +--- linux-3.18.9.orig/sound/soc/codecs/Kconfig 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/Kconfig 2015-03-08 03:38:45.530040940 -0500 @@ -80,6 +80,8 @@ select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER @@ -135769,9 +135133,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconf config SND_SOC_TLV320AIC23 tristate -diff -Nur linux-3.18.8/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile ---- linux-3.18.8/sound/soc/codecs/Makefile 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/Makefile 2015-03-05 14:40:19.317715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/Makefile linux-3.18.9/sound/soc/codecs/Makefile +--- linux-3.18.9.orig/sound/soc/codecs/Makefile 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/Makefile 2015-03-08 03:38:45.530040940 -0500 @@ -74,6 +74,8 @@ snd-soc-pcm512x-spi-objs := pcm512x-spi.o snd-soc-rl6231-objs := rl6231.o @@ -135806,9 +135170,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Make obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o -diff -Nur linux-3.18.8/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c ---- linux-3.18.8/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm1794a.c 2015-03-05 14:40:19.325715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm1794a.c linux-3.18.9/sound/soc/codecs/pcm1794a.c +--- linux-3.18.9.orig/sound/soc/codecs/pcm1794a.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/pcm1794a.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,62 @@ +/* + * Driver for the PCM1794A codec @@ -135872,9 +135236,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM1794A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c ---- linux-3.18.8/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm5102a.c 2015-03-05 14:40:19.325715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm5102a.c linux-3.18.9/sound/soc/codecs/pcm5102a.c +--- linux-3.18.9.orig/sound/soc/codecs/pcm5102a.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/pcm5102a.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,70 @@ +/* + * Driver for the PCM5102A codec @@ -135946,9 +135310,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM5102A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c ---- linux-3.18.8/sound/soc/codecs/pcm512x.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm512x.c 2015-03-05 14:40:19.325715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm512x.c linux-3.18.9/sound/soc/codecs/pcm512x.c +--- linux-3.18.9.orig/sound/soc/codecs/pcm512x.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/pcm512x.c 2015-03-08 03:38:45.530040940 -0500 @@ -259,8 +259,8 @@ pcm512x_ramp_step_text); @@ -135960,9 +135324,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, -diff -Nur linux-3.18.8/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas5713.c ---- linux-3.18.8/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/tas5713.c 2015-03-05 14:40:19.333715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.c linux-3.18.9/sound/soc/codecs/tas5713.c +--- linux-3.18.9.orig/sound/soc/codecs/tas5713.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/tas5713.c 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,369 @@ +/* + * ASoC Driver for TAS5713 @@ -136333,9 +135697,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for TAS5713"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.8/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas5713.h ---- linux-3.18.8/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/tas5713.h 2015-03-05 14:40:19.333715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.h linux-3.18.9/sound/soc/codecs/tas5713.h +--- linux-3.18.9.orig/sound/soc/codecs/tas5713.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/tas5713.h 2015-03-08 03:38:45.530040940 -0500 @@ -0,0 +1,210 @@ +/* + * ASoC Driver for TAS5713 @@ -136547,9 +135911,9 @@ diff -Nur linux-3.18.8/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas + + +#endif /* _TAS5713_H */ -diff -Nur linux-3.18.8/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c ---- linux-3.18.8/sound/soc/codecs/wm8804.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/wm8804.c 2015-03-05 14:40:19.341715789 +0100 +diff -Nur linux-3.18.9.orig/sound/soc/codecs/wm8804.c linux-3.18.9/sound/soc/codecs/wm8804.c +--- linux-3.18.9.orig/sound/soc/codecs/wm8804.c 2015-03-06 16:53:42.000000000 -0600 ++++ linux-3.18.9/sound/soc/codecs/wm8804.c 2015-03-08 03:38:45.530040940 -0500 @@ -278,6 +278,7 @@ blen = 0x1; break; diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index c6463e0ac..3a7519863 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -13,12 +13,6 @@ config ADK_KERNEL_SND_SOC config ADK_KERNEL_SND_ARM bool -config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM - bool - -config ADK_KERNEL_SND_DMAENGINE_PCM - bool - config ADK_KERNEL_SND_SOC_SPDIF bool @@ -55,8 +49,6 @@ config ADK_KERNEL_SND_TIMER config ADK_KERNEL_SND_PCM bool select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_DMAENGINE_PCM - select ADK_KERNEL_SND_PCM_DMAENGINE config ADK_KERNEL_SND_HWDEP bool @@ -99,9 +91,6 @@ config ADK_KERNEL_SND_SOC_PCM512x_SPI select ADK_KERNEL_SND_SOC_PCM512x select ADK_KERNEL_SND_SOC_I2C_AND_SPI -config ADK_KERNEL_SND_PCM_DMAENGINE - bool - config ADK_KERNEL_SND bool select ADK_KERNEL_SOUND @@ -172,8 +161,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC select ADK_KERNEL_SND_BCM2835 select ADK_KERNEL_DMA_BCM2835 - select ADK_KERNEL_SND_DMAENGINE_PCM - select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO depends on ADK_TARGET_BOARD_BCM28XX default n @@ -217,8 +204,6 @@ config ADK_KERNEL_SND_IMX_SOC bool "IMX6 SoC sound chip" select ADK_KERNEL_SND select ADK_KERNEL_SND_SOC - select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM - select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_IMX_PCM_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI @@ -228,7 +213,6 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_SND_SOC_FSL_SPDIF select ADK_KERNEL_REGMAP_SPI select ADK_KERNEL_REGMAP_I2C - select ADK_KERNEL_SND_PCM_DMAENGINE depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_14 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index c08fac5c9..519f6284a 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -96,9 +96,6 @@ config ADK_KERNEL_MMC_BCM2835 config ADK_KERNEL_MMC_BCM2835_DMA bool -config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA - bool - menu "SATA/PATA devices support" depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX @@ -298,7 +295,7 @@ config ADK_KERNEL_MMC_AT91 default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n -config ADK_KERNEL_MMC_SDHCI_BCM2708 +config ADK_KERNEL_MMC_BCM2835 bool "SD card support for BCM2835 boards" select ADK_KERNEL_SCSI select ADK_KERNEL_MMC @@ -306,10 +303,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708 select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_MMC_SDHCI - select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS select ADK_KERNEL_MMC_SDHCI_PLTFM - select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA - select ADK_KERNEL_MMC_BCM2835 select ADK_KERNEL_MMC_BCM2835_DMA depends on ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_BOARD_BCM28XX diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index 9d819aca3..010b6b105 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -24,7 +24,7 @@ config ADK_KERNEL_CMA config ADK_KERNEL_CMA_SIZE_MBYTES int - default 64 + default 8 config ADK_KERNEL_DMA_CMA bool |