summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-09 11:53:06 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-09 11:53:06 +0100
commitecf3290a88183d946e731b2fb3992dc5c3222a0f (patch)
treef41a6b067eacec9f941345cc5764c97ce140f35b /target
parent4e93572589af66eee723efafa3939f6c5e0dd7cc (diff)
parent108dbac584a1ffc505dc2d02d95ebb2c5e3ddaf7 (diff)
merge
Diffstat (limited to 'target')
-rw-r--r--target/linux/config/Config.in.graphics9
-rw-r--r--target/linux/config/Config.in.netdevice8
-rw-r--r--target/linux/patches/3.11.10/raspberry.patch189205
-rw-r--r--target/linux/patches/3.12.6/raspberry.patch173618
4 files changed, 6843 insertions, 355997 deletions
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index af28b91d7..f6f3962cf 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -50,10 +50,19 @@ config ADK_KERNEL_AGP
config ADK_KERNEL_AGP_INTEL
boolean
+
+config ADK_KERNEL_LOGO
+ boolean
menu "Graphic devices support"
depends on ADK_TARGET_WITH_VGA
+config ADK_KERNEL_LOGO_LINUX_CLUT224
+ prompt "Enable Linux penguin boot logo"
+ boolean
+ select ADK_KERNEL_LOGO
+ default n
+
config ADK_KERNEL_FB_VESA
prompt "................................ Framebuffer support for VirtualBox Emulator (VESA)"
boolean
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 9ee0511fc..cdd602cd7 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -323,6 +323,9 @@ config ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
config ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
tristate
+config ADK_KERNEL_RTL_CARDS
+ boolean
+
config ADK_KERNEL_RT2X00
boolean
select ADK_KPACKAGE_KMOD_RT2X00
@@ -504,9 +507,10 @@ config ADK_KPACKAGE_KMOD_RT2800USB
config ADK_KPACKAGE_KMOD_RTL8192CU
prompt "kmod-rtl8192cu............... Realtek RTL8192CU USB"
tristate
+ select ADK_KERNEL_RTL_CARDS
select ADK_KPACKAGE_KMOD_MAC80211
- select ADK_KERNEL_CFG80211_WEXT
- select ADK_KERNEL_WIRELESS_EXT
+ select ADK_KPACKAGE_KMOD_FW_LOADER
+ select ADK_PACKAGE_REALTEK_FIRMWARE
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
default n
help
diff --git a/target/linux/patches/3.11.10/raspberry.patch b/target/linux/patches/3.11.10/raspberry.patch
index f1902e4c0..156e44201 100644
--- a/target/linux/patches/3.11.10/raspberry.patch
+++ b/target/linux/patches/3.11.10/raspberry.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_cutdown_defconfig raspberry-linux/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.11.2/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-10-15 12:28:21.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.11.10/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.11.10.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,503 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -505,9 +505,9 @@ diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_cutdown_defconfig raspberry-linux
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_defconfig raspberry-linux/arch/arm/configs/bcmrpi_defconfig
---- linux-3.11.2/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/configs/bcmrpi_defconfig 2013-10-15 12:28:21.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/configs/bcmrpi_defconfig linux-3.11.10/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.11.10.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/configs/bcmrpi_defconfig 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,991 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -1500,9 +1500,9 @@ diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_defconfig raspberry-linux/arch/ar
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_emergency_defconfig raspberry-linux/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.11.2/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/configs/bcmrpi_emergency_defconfig 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.11.10/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.11.10.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/configs/bcmrpi_emergency_defconfig 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,532 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -2036,9 +2036,9 @@ diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_emergency_defconfig raspberry-lin
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_quick_defconfig raspberry-linux/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.11.2/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/configs/bcmrpi_quick_defconfig 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.11.10/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.11.10.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/configs/bcmrpi_quick_defconfig 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -2237,9 +2237,9 @@ diff -Nur linux-3.11.2/arch/arm/configs/bcmrpi_quick_defconfig raspberry-linux/a
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.11.2/arch/arm/include/asm/fiq.h raspberry-linux/arch/arm/include/asm/fiq.h
---- linux-3.11.2/arch/arm/include/asm/fiq.h 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/include/asm/fiq.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/include/asm/fiq.h linux-3.11.10/arch/arm/include/asm/fiq.h
+--- linux-3.11.10.orig/arch/arm/include/asm/fiq.h 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/include/asm/fiq.h 2014-02-07 19:57:28.000000000 +0100
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs);
@@ -2248,9 +2248,9 @@ diff -Nur linux-3.11.2/arch/arm/include/asm/fiq.h raspberry-linux/arch/arm/inclu
static inline void set_fiq_regs(struct pt_regs const *regs)
{
-diff -Nur linux-3.11.2/arch/arm/Kconfig raspberry-linux/arch/arm/Kconfig
---- linux-3.11.2/arch/arm/Kconfig 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/Kconfig 2013-10-15 12:28:20.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/Kconfig linux-3.11.10/arch/arm/Kconfig
+--- linux-3.11.10.orig/arch/arm/Kconfig 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/Kconfig 2014-02-07 19:57:28.000000000 +0100
@@ -366,6 +366,23 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -2283,9 +2283,9 @@ diff -Nur linux-3.11.2/arch/arm/Kconfig raspberry-linux/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-diff -Nur linux-3.11.2/arch/arm/Kconfig.debug raspberry-linux/arch/arm/Kconfig.debug
---- linux-3.11.2/arch/arm/Kconfig.debug 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/Kconfig.debug 2013-10-15 12:28:20.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/Kconfig.debug linux-3.11.10/arch/arm/Kconfig.debug
+--- linux-3.11.10.orig/arch/arm/Kconfig.debug 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/Kconfig.debug 2014-02-07 19:57:28.000000000 +0100
@@ -610,6 +610,14 @@
For more details about semihosting, please see
chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
@@ -2301,9 +2301,9 @@ diff -Nur linux-3.11.2/arch/arm/Kconfig.debug raspberry-linux/arch/arm/Kconfig.d
endchoice
config DEBUG_EXYNOS_UART
-diff -Nur linux-3.11.2/arch/arm/kernel/fiqasm.S raspberry-linux/arch/arm/kernel/fiqasm.S
---- linux-3.11.2/arch/arm/kernel/fiqasm.S 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/kernel/fiqasm.S 2013-10-15 12:28:21.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/kernel/fiqasm.S linux-3.11.10/arch/arm/kernel/fiqasm.S
+--- linux-3.11.10.orig/arch/arm/kernel/fiqasm.S 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/kernel/fiqasm.S 2014-02-07 19:57:28.000000000 +0100
@@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -2322,9 +2322,9 @@ diff -Nur linux-3.11.2/arch/arm/kernel/fiqasm.S raspberry-linux/arch/arm/kernel/
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.11.2/arch/arm/kernel/fiq.c raspberry-linux/arch/arm/kernel/fiq.c
---- linux-3.11.2/arch/arm/kernel/fiq.c 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/kernel/fiq.c 2013-10-15 12:28:21.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/kernel/fiq.c linux-3.11.10/arch/arm/kernel/fiq.c
+--- linux-3.11.10.orig/arch/arm/kernel/fiq.c 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/kernel/fiq.c 2014-02-07 19:57:28.000000000 +0100
@@ -142,6 +142,7 @@
EXPORT_SYMBOL(set_fiq_handler);
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
@@ -2333,9 +2333,9 @@ diff -Nur linux-3.11.2/arch/arm/kernel/fiq.c raspberry-linux/arch/arm/kernel/fiq
EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.11.2/arch/arm/kernel/process.c raspberry-linux/arch/arm/kernel/process.c
---- linux-3.11.2/arch/arm/kernel/process.c 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/kernel/process.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/kernel/process.c linux-3.11.10/arch/arm/kernel/process.c
+--- linux-3.11.10.orig/arch/arm/kernel/process.c 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/kernel/process.c 2014-02-07 19:57:28.000000000 +0100
@@ -176,6 +176,16 @@
default_idle();
}
@@ -2353,9 +2353,9 @@ diff -Nur linux-3.11.2/arch/arm/kernel/process.c raspberry-linux/arch/arm/kernel
/*
* Called by kexec, immediately prior to machine_kexec().
*
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/armctrl.c raspberry-linux/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.11.2/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/armctrl.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.11.10/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/armctrl.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,219 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2576,9 +2576,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/armctrl.c raspberry-linux/arch/arm/
+ init_FIQ(FIQ_START);
+ return 0;
+}
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/armctrl.h raspberry-linux/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.11.2/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/armctrl.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.11.10/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/armctrl.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2607,9 +2607,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/armctrl.h raspberry-linux/arch/arm/
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.c raspberry-linux/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/bcm2708.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.11.10/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/bcm2708.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,917 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3528,9 +3528,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.c raspberry-linux/arch/arm/
+module_param(serial, uint, 0644);
+module_param(uart_clock, uint, 0644);
+module_param(reboot_part, uint, 0644);
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708_gpio.c raspberry-linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.11.2/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.11.10/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,339 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -3871,9 +3871,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708_gpio.c raspberry-linux/arch
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.h raspberry-linux/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/bcm2708.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.11.10/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/bcm2708.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -3926,9 +3926,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/bcm2708.h raspberry-linux/arch/arm/
+}
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/clock.c raspberry-linux/arch/arm/mach-bcm2708/clock.c
---- linux-3.11.2/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/clock.c 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/clock.c linux-3.11.10/arch/arm/mach-bcm2708/clock.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/clock.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.c
@@ -3991,9 +3991,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/clock.c raspberry-linux/arch/arm/ma
+ return -EIO;
+}
+EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/clock.h raspberry-linux/arch/arm/mach-bcm2708/clock.h
---- linux-3.11.2/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/clock.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/clock.h linux-3.11.10/arch/arm/mach-bcm2708/clock.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/clock.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,24 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.h
@@ -4019,9 +4019,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/clock.h raspberry-linux/arch/arm/ma
+struct clk {
+ unsigned long rate;
+};
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/dma.c raspberry-linux/arch/arm/mach-bcm2708/dma.c
---- linux-3.11.2/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/dma.c 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/dma.c linux-3.11.10/arch/arm/mach-bcm2708/dma.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/dma.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,399 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
@@ -4422,9 +4422,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/dma.c raspberry-linux/arch/arm/mach
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/dmaer.c raspberry-linux/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.11.2/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/dmaer.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.11.10/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/dmaer.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,886 @@
+#include <linux/init.h>
+#include <linux/sched.h>
@@ -5312,9 +5312,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/dmaer.c raspberry-linux/arch/arm/ma
+MODULE_AUTHOR("Simon Hall");
+module_init(dmaer_init);
+module_exit(dmaer_exit);
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_control.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5735,9 +5735,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_control.h raspberr
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_power.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,60 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5799,9 +5799,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/arm_power.h raspberry-
+};
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/clkdev.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -5810,9 +5810,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/clkdev.h raspberry-lin
+#define __clk_put(clk) do { } while (0)
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S raspberry-linux/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.11.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -5836,9 +5836,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S raspberr
+ .endm
+
+#include <asm/hardware/debug-pl01x.S>
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/dma.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/dma.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/dma.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,86 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -5926,9 +5926,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/dma.h raspberry-linux/
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S raspberry-linux/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.11.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -5999,9 +5999,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S raspberr
+1020: @ EQ will be set if no irqs pending
+
+ .endm
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/frc.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/frc.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/frc.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6041,9 +6041,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/frc.h raspberry-linux/
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/gpio.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,17 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6062,9 +6062,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/gpio.h raspberry-linux
+#define irq_to_gpio(x) ((x) - GPIO_IRQ_START)
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/hardware.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6094,9 +6094,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/hardware.h raspberry-l
+#include <mach/platform.h>
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/io.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/io.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/io.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -6125,9 +6125,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/io.h raspberry-linux/a
+#define __io(a) __typesafe_io(a)
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/irqs.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6328,9 +6328,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/irqs.h raspberry-linux
+
+
+#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/memory.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/memory.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/memory.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6389,9 +6389,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/memory.h raspberry-lin
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/platform.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/platform.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/platform.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,226 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6619,9 +6619,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/platform.h raspberry-l
+#endif
+
+/* END */
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/power.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/power.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/power.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -6649,9 +6649,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/power.h raspberry-linu
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/system.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/system.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/system.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -6691,9 +6691,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/system.h raspberry-lin
+}
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/timex.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/timex.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/timex.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6718,9 +6718,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/timex.h raspberry-linu
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/uncompress.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6806,9 +6806,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/uncompress.h raspberry
+ * nothing to do
+ */
+#define arch_decomp_wdog()
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vcio.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,141 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -6951,9 +6951,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vcio.h raspberry-linux
+#define DEVICE_FILE_NAME "char_dev"
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,35 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -6990,9 +6990,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h raspberry-lin
+#endif
+
+#endif /* VC_MEM_H */
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_support.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/vc_support.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vc_support.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,69 @@
+#ifndef _VC_SUPPORT_H_
+#define _VC_SUPPORT_H_
@@ -7063,9 +7063,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vc_support.h raspberry
+ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
+
+#endif
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h raspberry-linux/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -7087,9 +7087,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h raspberry-li
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END (0xe8000000)
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/Kconfig raspberry-linux/arch/arm/mach-bcm2708/Kconfig
---- linux-3.11.2/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/Kconfig 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/Kconfig linux-3.11.10/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/Kconfig 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,48 @@
+menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708
@@ -7139,9 +7139,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/Kconfig raspberry-linux/arch/arm/ma
+ help
+ Binds spidev driver to the SPI0 master
+endmenu
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/Makefile raspberry-linux/arch/arm/mach-bcm2708/Makefile
---- linux-3.11.2/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/Makefile 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/Makefile linux-3.11.10/arch/arm/mach-bcm2708/Makefile
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/Makefile 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux kernel.
@@ -7153,16 +7153,16 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/Makefile raspberry-linux/arch/arm/m
+
+obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o
+dmaer_master-objs := dmaer.o vc_support.o
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/Makefile.boot raspberry-linux/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.11.2/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/Makefile.boot 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.11.10/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/Makefile.boot 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000
+params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/power.c raspberry-linux/arch/arm/mach-bcm2708/power.c
---- linux-3.11.2/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/power.c 2013-10-15 11:22:34.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/power.c linux-3.11.10/arch/arm/mach-bcm2708/power.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/power.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,194 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.c
@@ -7358,9 +7358,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/power.c raspberry-linux/arch/arm/ma
+MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vcio.c raspberry-linux/arch/arm/mach-bcm2708/vcio.c
---- linux-3.11.2/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/vcio.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/vcio.c linux-3.11.10/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/vcio.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-bcm2708/vcio.c
@@ -7836,9 +7836,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vcio.c raspberry-linux/arch/arm/mac
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vc_mem.c raspberry-linux/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.11.2/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/vc_mem.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.11.10/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/vc_mem.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,462 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -8302,9 +8302,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vc_mem.c raspberry-linux/arch/arm/m
+module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644);
+
-diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vc_support.c raspberry-linux/arch/arm/mach-bcm2708/vc_support.c
---- linux-3.11.2/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
-+++ raspberry-linux/arch/arm/mach-bcm2708/vc_support.c 2013-10-15 12:28:22.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.11.10/arch/arm/mach-bcm2708/vc_support.c
+--- linux-3.11.10.orig/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.11.10/arch/arm/mach-bcm2708/vc_support.c 2014-02-07 19:57:28.000000000 +0100
@@ -0,0 +1,318 @@
+/*
+ * vc_support.c
@@ -8624,9 +8624,9 @@ diff -Nur linux-3.11.2/arch/arm/mach-bcm2708/vc_support.c raspberry-linux/arch/a
+ return 1;
+ }
+}
-diff -Nur linux-3.11.2/arch/arm/Makefile raspberry-linux/arch/arm/Makefile
---- linux-3.11.2/arch/arm/Makefile 2013-09-27 02:22:44.000000000 +0200
-+++ raspberry-linux/arch/arm/Makefile 2013-10-15 12:28:20.000000000 +0200
+diff -Nur linux-3.11.10.orig/arch/arm/Makefile linux-3.11.10/arch/arm/Makefile
+--- linux-3.11.10.orig/arch/arm/Makefile 2013-11-29 19:42:37.000000000 +0100
++++ linux-3.11.10/arch/arm/Makefile 2014-02-07 19:57:28.000000000 +0100
@@ -146,6 +146,7 @@
# by CONFIG_* macro name.