diff options
-rw-r--r-- | package/eglibc/Config.in.manual | 1 | ||||
-rw-r--r-- | package/eglibc/Makefile | 1 | ||||
-rw-r--r-- | package/glibc/Config.in.manual | 1 | ||||
-rw-r--r-- | package/glibc/Makefile | 1 | ||||
-rw-r--r-- | package/polipo/Makefile | 30 | ||||
-rw-r--r-- | package/polipo/files/config | 153 | ||||
-rw-r--r-- | package/polipo/files/polipo.conffiles | 1 | ||||
-rw-r--r-- | package/polipo/files/polipo.init | 27 | ||||
-rw-r--r-- | package/polipo/files/polipo.postinst | 3 | ||||
-rw-r--r-- | package/polipo/patches/patch-Makefile | 11 | ||||
-rw-r--r-- | package/samba/files/smb.conf | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 1 | ||||
-rw-r--r-- | target/linux/patches/3.9.9/raspberry.patch | 4402 |
13 files changed, 1480 insertions, 3154 deletions
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual index 0e7598edf..fd6d6fbb8 100644 --- a/package/eglibc/Config.in.manual +++ b/package/eglibc/Config.in.manual @@ -4,6 +4,7 @@ config ADK_PACKAGE_EGLIBC default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY default n depends on ADK_TARGET_LIB_EGLIBC + select ADK_PACKAGE_TZDATA help embedded GNU C library. diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index d9acdb8fd..9f37255cf 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -9,7 +9,6 @@ PKG_DESCR:= embedded GNU C library PKG_SECTION:= base PKG_OPTS:= noremove PKG_SUBPKGS:= EGLIBC EGLIBC_DEV EGLIBC_STATIC -PKG_DEPENDS:= tzdata NO_DISTFILES:= 1 diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual index e149fb144..dd5ab418a 100644 --- a/package/glibc/Config.in.manual +++ b/package/glibc/Config.in.manual @@ -4,6 +4,7 @@ config ADK_PACKAGE_GLIBC default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY default n depends on ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_TZDATA help GNU C library. diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 2e50073f8..c6e57b460 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -14,7 +14,6 @@ PKG_VER:= 2.16 PKG_SECTION:= base PKG_OPTS:= noremove PKG_SUBPKGS:= GLIBC GLIBC_DEV GLIBC_STATIC -PKG_DEPENDS:= tzdata NO_DISTFILES:= 1 diff --git a/package/polipo/Makefile b/package/polipo/Makefile new file mode 100644 index 000000000..7ab1e8e91 --- /dev/null +++ b/package/polipo/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= polipo +PKG_VERSION:= 1.0.4.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= bfc5c85289519658280e093a270d6703 +PKG_DESCR:= HTTP 1.1 proxy with Socks5 support +PKG_SECTION:= proxy +PKG_URL:= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/ +PKG_SITES:= http://freehaven.net/~chrisd/polipo/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,POLIPO,polipo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE= manual +FAKE_FLAGS+= TARGET=${WRKINST} + +polipo-install: + $(INSTALL_DIR) $(IDIR_POLIPO)/etc/polipo + $(INSTALL_DATA) ./files/config \ + $(IDIR_POLIPO)/etc/polipo + $(INSTALL_DIR) $(IDIR_POLIPO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/local/bin/polipo \ + $(IDIR_POLIPO)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/polipo/files/config b/package/polipo/files/config new file mode 100644 index 000000000..6f33ff64c --- /dev/null +++ b/package/polipo/files/config @@ -0,0 +1,153 @@ +# Sample configuration file for Polipo. -*-sh-*- + +# You should not need to use a configuration file; all configuration +# variables have reasonable defaults. If you want to use one, you +# can copy this to /etc/polipo/config or to ~/.polipo and modify. + +# This file only contains some of the configuration variables; see the +# list given by ``polipo -v'' and the manual for more. + +daemonise = true + +### Basic configuration +### ******************* + +# Uncomment one of these if you want to allow remote clients to +# connect: + +# proxyAddress = "::0" # both IPv4 and IPv6 +# proxyAddress = "0.0.0.0" # IPv4 only + +# If you do that, you'll want to restrict the set of hosts allowed to +# connect: + +# allowedClients = "127.0.0.1, 134.157.168.57" +# allowedClients = "127.0.0.1, 134.157.168.0/24" + +# Uncomment this if you want your Polipo to identify itself by +# something else than the host name: + +# proxyName = "polipo.example.org" + +# Uncomment this if there's only one user using this instance of Polipo: + +# cacheIsShared = false + +# Uncomment this if you want to use a parent proxy: + +# parentProxy = "squid.example.org:3128" + +# Uncomment this if you want to use a parent SOCKS proxy: + +# socksParentProxy = "localhost:9050" +# socksProxyType = socks5 + + +### Memory +### ****** + +# Uncomment this if you want Polipo to use a ridiculously small amount +# of memory (a hundred C-64 worth or so): + +# chunkHighMark = 819200 +# objectHighMark = 128 + +# Uncomment this if you've got plenty of memory: + +# chunkHighMark = 50331648 +# objectHighMark = 16384 + + +### On-disk data +### ************ + +# Uncomment this if you want to disable the on-disk cache: + +# diskCacheRoot = "" + +# Uncomment this if you want to put the on-disk cache in a +# non-standard location: + +# diskCacheRoot = "~/.polipo-cache/" + +# Uncomment this if you want to disable the local web server: + +# localDocumentRoot = "" + +# Uncomment this if you want to enable the pages under /polipo/index? +# and /polipo/servers?. This is a serious privacy leak if your proxy +# is shared. + +# disableIndexing = false +# disableServersList = false + + +### Domain Name System +### ****************** + +# Uncomment this if you want to contact IPv4 hosts only (and make DNS +# queries somewhat faster): + +# dnsQueryIPv6 = no + +# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for +# double-stack hosts: + +# dnsQueryIPv6 = reluctantly + +# Uncomment this to disable Polipo's DNS resolver and use the system's +# default resolver instead. If you do that, Polipo will freeze during +# every DNS query: + +# dnsUseGethostbyname = yes + + +### HTTP +### **** + +# Uncomment this if you want to enable detection of proxy loops. +# This will cause your hostname (or whatever you put into proxyName +# above) to be included in every request: + +# disableVia=false + +# Uncomment this if you want to slightly reduce the amount of +# information that you leak about yourself: + +# censoredHeaders = from, accept-language +# censorReferer = maybe + +# Uncomment this if you're paranoid. This will break a lot of sites, +# though: + +# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language +# censorReferer = true + +# Uncomment this if you want to use Poor Man's Multiplexing; increase +# the sizes if you're on a fast line. They should each amount to a few +# seconds' worth of transfer; if pmmSize is small, you'll want +# pmmFirstSize to be larger. + +# Note that PMM is somewhat unreliable. + +# pmmFirstSize = 16384 +# pmmSize = 8192 + +# Uncomment this if your user-agent does something reasonable with +# Warning headers (most don't): + +# relaxTransparency = maybe + +# Uncomment this if you never want to revalidate instances for which +# data is available (this is not a good idea): + +# relaxTransparency = yes + +# Uncomment this if you have no network: + +# proxyOffline = yes + +# Uncomment this if you want to avoid revalidating instances with a +# Vary header (this is not a good idea): + +# mindlesslyCacheVary = true diff --git a/package/polipo/files/polipo.conffiles b/package/polipo/files/polipo.conffiles new file mode 100644 index 000000000..cd6dd1bcb --- /dev/null +++ b/package/polipo/files/polipo.conffiles @@ -0,0 +1 @@ +/etc/polipo/config diff --git a/package/polipo/files/polipo.init b/package/polipo/files/polipo.init new file mode 100644 index 000000000..636159337 --- /dev/null +++ b/package/polipo/files/polipo.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG polipo +#INIT 85 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${polipo:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/bin/polipo + ;; +stop) + kill -15 $(pgrep -f /usr/bin/polipo) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/polipo/files/polipo.postinst b/package/polipo/files/polipo.postinst new file mode 100644 index 000000000..4a76207e8 --- /dev/null +++ b/package/polipo/files/polipo.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf polipo polipo NO diff --git a/package/polipo/patches/patch-Makefile b/package/polipo/patches/patch-Makefile new file mode 100644 index 000000000..6aa6677d0 --- /dev/null +++ b/package/polipo/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- polipo-1.0.4.1.orig/Makefile 2010-02-01 00:13:20.000000000 +0100 ++++ polipo-1.0.4.1/Makefile 2013-07-22 18:06:28.000000000 +0200 +@@ -63,7 +63,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_RO + + DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) + +-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) ++CFLAGS ?= $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) + + SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ + config.c local.c http.c client.c server.c auth.c tunnel.c \ diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf index 0205a11e5..2ac0576d8 100644 --- a/package/samba/files/smb.conf +++ b/package/samba/files/smb.conf @@ -1,6 +1,7 @@ [global] syslog = 1 syslog only = yes + log level = 1 workgroup = OpenADK server string = OpenADK Samba Server security = user @@ -20,3 +21,4 @@ # comment = Media files # read only = yes # guest ok = yes +# path = /media diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 3fb705e97..bbd9ce745 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -177,6 +177,7 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + default y if ADK_TARGET_SYSTEM_QEMU_ARM default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL diff --git a/target/linux/patches/3.9.9/raspberry.patch b/target/linux/patches/3.9.9/raspberry.patch index f50fc05c7..694eb7414 100644 --- a/target/linux/patches/3.9.9/raspberry.patch +++ b/target/linux/patches/3.9.9/raspberry.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.9.9/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.9.9/arch/arm/configs/bcmrpi_defconfig +--- linux-3.9.9.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/configs/bcmrpi_defconfig 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,1034 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -1036,9 +1036,9 @@ diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/confi +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.9.9.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,533 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1573,9 +1573,9 @@ diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y +CONFIG_F2FS=y -diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.9.9.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -1774,9 +1774,9 @@ diff -Nur linux-3.9.9/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.9.9/arch/arm/include/asm/fiq.h linux-rpi/arch/arm/include/asm/fiq.h ---- linux-3.9.9/arch/arm/include/asm/fiq.h 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/include/asm/fiq.h 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/include/asm/fiq.h linux-3.9.9/arch/arm/include/asm/fiq.h +--- linux-3.9.9.orig/arch/arm/include/asm/fiq.h 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/include/asm/fiq.h 2013-07-29 15:24:41.000000000 +0200 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -1785,9 +1785,9 @@ diff -Nur linux-3.9.9/arch/arm/include/asm/fiq.h linux-rpi/arch/arm/include/asm/ static inline void set_fiq_regs(struct pt_regs const *regs) { -diff -Nur linux-3.9.9/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-3.9.9/arch/arm/Kconfig 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/Kconfig linux-3.9.9/arch/arm/Kconfig +--- linux-3.9.9.orig/arch/arm/Kconfig 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/Kconfig 2013-07-29 15:24:41.000000000 +0200 @@ -361,6 +361,23 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -1820,9 +1820,9 @@ diff -Nur linux-3.9.9/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.9.9/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-3.9.9/arch/arm/Kconfig.debug 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig.debug 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/Kconfig.debug linux-3.9.9/arch/arm/Kconfig.debug +--- linux-3.9.9.orig/arch/arm/Kconfig.debug 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/Kconfig.debug 2013-07-29 15:24:41.000000000 +0200 @@ -483,6 +483,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -1838,20 +1838,21 @@ diff -Nur linux-3.9.9/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_IMX_UART_PORT -diff -Nur linux-3.9.9/arch/arm/kernel/armksyms.c linux-rpi/arch/arm/kernel/armksyms.c ---- linux-3.9.9/arch/arm/kernel/armksyms.c 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/armksyms.c 2013-07-08 13:33:14.000000000 +0200 -@@ -156,3 +156,7 @@ +diff -Nur linux-3.9.9.orig/arch/arm/kernel/armksyms.c linux-3.9.9/arch/arm/kernel/armksyms.c +--- linux-3.9.9.orig/arch/arm/kernel/armksyms.c 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/kernel/armksyms.c 2013-07-29 15:27:23.000000000 +0200 +@@ -156,3 +156,8 @@ #ifdef CONFIG_ARM_PATCH_PHYS_VIRT EXPORT_SYMBOL(__pv_phys_offset); #endif + ++#ifdef CONFIG_CPU_TLB_V6 +extern void v6wbi_flush_kern_tlb_range(void); +EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range); -+ -diff -Nur linux-3.9.9/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-3.9.9/arch/arm/kernel/fiqasm.S 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2013-07-08 13:33:14.000000000 +0200 ++#endif +diff -Nur linux-3.9.9.orig/arch/arm/kernel/fiqasm.S linux-3.9.9/arch/arm/kernel/fiqasm.S +--- linux-3.9.9.orig/arch/arm/kernel/fiqasm.S 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/kernel/fiqasm.S 2013-07-29 15:24:41.000000000 +0200 @@ -25,6 +25,9 @@ ENTRY(__set_fiq_regs) mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE @@ -1870,9 +1871,9 @@ diff -Nur linux-3.9.9/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm. +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.9.9/arch/arm/kernel/fiq.c linux-rpi/arch/arm/kernel/fiq.c ---- linux-3.9.9/arch/arm/kernel/fiq.c 2013-07-03 19:56:36.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/fiq.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/kernel/fiq.c linux-3.9.9/arch/arm/kernel/fiq.c +--- linux-3.9.9.orig/arch/arm/kernel/fiq.c 2013-07-03 19:56:36.000000000 +0200 ++++ linux-3.9.9/arch/arm/kernel/fiq.c 2013-07-29 15:24:41.000000000 +0200 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -1881,9 +1882,9 @@ diff -Nur linux-3.9.9/arch/arm/kernel/fiq.c linux-rpi/arch/arm/kernel/fiq.c EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,219 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2104,9 +2105,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bc + init_FIQ(FIQ_START); + return 0; +} -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2135,9 +2136,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bc + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,885 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3024,9 +3025,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bc +module_param(boardrev, uint, 0644); +module_param(serial, uint, 0644); +module_param(uart_clock, uint, 0644); -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -3367,9 +3368,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/ma + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -3422,9 +3423,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bc +} + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c ---- linux-3.9.9/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/clock.c linux-3.9.9/arch/arm/mach-bcm2708/clock.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/clock.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -3487,9 +3488,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2 + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h ---- linux-3.9.9/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.h 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/clock.h linux-3.9.9/arch/arm/mach-bcm2708/clock.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/clock.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -3515,9 +3516,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2 +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c ---- linux-3.9.9/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/dma.c linux-3.9.9/arch/arm/mach-bcm2708/dma.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/dma.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -3918,9 +3919,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm270 +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/dmaer.c linux-rpi/arch/arm/mach-bcm2708/dmaer.c ---- linux-3.9.9/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/dmaer.c 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.9.9/arch/arm/mach-bcm2708/dmaer.c +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/dmaer.c 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,887 @@ +#include <linux/init.h> +#include <linux/sched.h> @@ -4809,9 +4810,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/dmaer.c linux-rpi/arch/arm/mach-bcm2 +module_init(dmaer_init); +module_exit(dmaer_exit); + -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5232,9 +5233,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5296,9 +5297,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/a +}; + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5307,9 +5308,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.9.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5333,9 +5334,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi + .endm + +#include <asm/hardware/debug-pl01x.S> -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/dma.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,86 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5423,9 +5424,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/ar + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.9.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5496,9 +5497,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/frc.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5538,9 +5539,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/ar +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,18 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5560,9 +5561,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/a + +#endif + -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5592,9 +5593,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/ar +#include <mach/platform.h> + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/io.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5623,9 +5624,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5826,9 +5827,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/a + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/memory.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5887,9 +5888,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/platform.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,226 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6117,9 +6118,9 @@ diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/ar +#endif + +/* END */ -diff -Nur linux-3.9.9/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.9.9/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 2013-07-08 13:33:14.000000000 +0200 +diff -Nur linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.9.9/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.9.9.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.9.9/arch/arm/mach-bcm2708/include/mach/power.h 2013-07-29 15:24:41.000000000 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6147,9 +6148,9 @@ diff -Nur linux-3.9.9/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.9.9/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.9.9/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/in |