diff --git a/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch b/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch index 495149e625..5d476e566a 100644 --- a/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-601-RPi_support-0.1.patch @@ -1,6 +1,6 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/divdi3.c linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c --- linux-3.1.10/arch/arm/boot/compressed/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c 2012-05-02 00:07:04.994249720 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c 2012-05-09 22:40:53.446536995 +0200 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -342,7 +342,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/divdi3.c linux-3.1.10.patch/arc +} diff -Naur linux-3.1.10/arch/arm/boot/compressed/longlong.h linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h --- linux-3.1.10/arch/arm/boot/compressed/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h 2012-05-02 00:07:04.994249720 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h 2012-05-09 22:40:53.447537016 +0200 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -497,7 +497,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/longlong.h linux-3.1.10.patch/a +#define udiv_qrnnd __udiv_qrnnd_c diff -Naur linux-3.1.10/arch/arm/boot/compressed/Makefile linux-3.1.10.patch/arch/arm/boot/compressed/Makefile --- linux-3.1.10/arch/arm/boot/compressed/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/boot/compressed/Makefile 2012-05-02 00:07:04.993249700 +0200 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/Makefile 2012-05-09 22:40:53.445536974 +0200 @@ -121,11 +121,17 @@ LDFLAGS_vmlinux += -T @@ -519,7 +519,7 @@ diff -Naur linux-3.1.10/arch/arm/boot/compressed/Makefile linux-3.1.10.patch/arc # independently from the rest at run time. This can be achieved by diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-05-02 00:07:05.492259742 +0200 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-05-09 22:40:54.868565836 +0200 @@ -0,0 +1,494 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1017,7 +1017,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1.10.p +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig 2012-05-02 00:07:05.492259742 +0200 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_defconfig 2012-05-09 22:40:54.869565857 +0200 @@ -0,0 +1,530 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1551,33 +1551,50 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_defconfig linux-3.1.10.patch/arc +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-05-02 00:07:05.396257809 +0200 -@@ -0,0 +1,475 @@ ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-05-09 22:40:54.876565998 +0200 +@@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y ++CONFIG_BSD_PROCESS_ACCT=y ++CONFIG_BSD_PROCESS_ACCT_V3=y ++CONFIG_FHANDLE=y ++CONFIG_AUDIT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="../target_fs" -+# CONFIG_UID16 is not set -+# CONFIG_KALLSYMS is not set ++CONFIG_CGROUP_FREEZER=y ++CONFIG_CGROUP_DEVICE=y ++CONFIG_CGROUP_CPUACCT=y ++CONFIG_RESOURCE_COUNTERS=y ++CONFIG_BLK_CGROUP=y ++CONFIG_NAMESPACES=y ++CONFIG_SCHED_AUTOGROUP=y +CONFIG_EMBEDDED=y -+# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y ++CONFIG_PROFILING=y ++CONFIG_OPROFILE=m ++CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_BLK_DEV_BSG is not set ++CONFIG_BLK_DEV_THROTTLING=y ++CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_ARCH_BCM2708=y +CONFIG_NO_HZ=y ++CONFIG_HIGH_RES_TIMERS=y +CONFIG_AEABI=y ++CONFIG_SECCOMP=y ++CONFIG_CC_STACKPROTECTOR=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait" ++CONFIG_KEXEC=y +CONFIG_CPU_IDLE=y +CONFIG_VFP=y +CONFIG_BINFMT_MISC=m @@ -1646,10 +1663,11 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_MISC_DEVICES=y +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=m ++CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_LOWLEVEL is not set ++CONFIG_MD=y +CONFIG_NETDEVICES=y +CONFIG_TUN=m +CONFIG_PHYLIB=m @@ -1764,6 +1782,26 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set ++CONFIG_SOUND=y ++CONFIG_SND=m ++CONFIG_SND_SEQUENCER=m ++CONFIG_SND_SEQ_DUMMY=m ++CONFIG_SND_MIXER_OSS=m ++CONFIG_SND_PCM_OSS=m ++CONFIG_SND_SEQUENCER_OSS=y ++CONFIG_SND_HRTIMER=m ++CONFIG_SND_DUMMY=m ++CONFIG_SND_ALOOP=m ++CONFIG_SND_VIRMIDI=m ++CONFIG_SND_MTPAV=m ++CONFIG_SND_SERIAL_U16550=m ++CONFIG_SND_MPU401=m ++CONFIG_SND_BCM2835=m ++CONFIG_SND_USB_AUDIO=m ++CONFIG_SND_USB_UA101=m ++CONFIG_SND_USB_CAIAQ=m ++CONFIG_SND_USB_6FIRE=m ++CONFIG_SOUND_PRIME=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y +CONFIG_HID_A4TECH=m @@ -1828,7 +1866,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m ++CONFIG_USB_UAS=y +CONFIG_USB_LIBUSUAL=y +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m @@ -1924,6 +1962,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y ++CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y @@ -1933,10 +1972,13 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m ++CONFIG_FANOTIFY=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_FSCACHE=y ++CONFIG_FSCACHE_STATS=y ++CONFIG_FSCACHE_HISTOGRAM=y +CONFIG_CACHEFILES=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y @@ -1964,6 +2006,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_9P_FS=m ++CONFIG_9P_FS_POSIX_ACL=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y +CONFIG_EFI_PARTITION=y @@ -2006,10 +2049,24 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m -+# CONFIG_SCHED_DEBUG is not set -+# CONFIG_DEBUG_BUGVERBOSE is not set -+# CONFIG_FTRACE is not set -+# CONFIG_ARM_UNWIND is not set ++CONFIG_PRINTK_TIME=y ++CONFIG_DETECT_HUNG_TASK=y ++CONFIG_TIMER_STATS=y ++CONFIG_DEBUG_STACK_USAGE=y ++CONFIG_DEBUG_INFO=y ++CONFIG_DEBUG_MEMORY_INIT=y ++CONFIG_BOOT_PRINTK_DELAY=y ++CONFIG_LATENCYTOP=y ++CONFIG_SYSCTL_SYSCALL_CHECK=y ++CONFIG_IRQSOFF_TRACER=y ++CONFIG_SCHED_TRACER=y ++CONFIG_STACK_TRACER=y ++CONFIG_BLK_DEV_IO_TRACE=y ++CONFIG_FUNCTION_PROFILER=y ++CONFIG_KGDB=y ++CONFIG_KGDB_KDB=y ++CONFIG_KDB_KEYBOARD=y ++CONFIG_STRICT_DEVMEM=y +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_CBC=y @@ -2030,7 +2087,7 @@ diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.1.10 +CONFIG_LIBCRC32C=y diff -Naur linux-3.1.10/arch/arm/Kconfig linux-3.1.10.patch/arch/arm/Kconfig --- linux-3.1.10/arch/arm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/Kconfig 2012-05-02 00:07:04.992249680 +0200 ++++ linux-3.1.10.patch/arch/arm/Kconfig 2012-05-09 22:40:53.444536954 +0200 @@ -896,6 +896,19 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2061,7 +2118,7 @@ diff -Naur linux-3.1.10/arch/arm/Kconfig linux-3.1.10.patch/arch/arm/Kconfig config ARCH_ACORN diff -Naur linux-3.1.10/arch/arm/kernel/armksyms.c linux-3.1.10.patch/arch/arm/kernel/armksyms.c --- linux-3.1.10/arch/arm/kernel/armksyms.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/kernel/armksyms.c 2012-05-02 00:07:05.020250244 +0200 ++++ linux-3.1.10.patch/arch/arm/kernel/armksyms.c 2012-05-09 22:40:53.448537037 +0200 @@ -46,6 +46,8 @@ extern void __aeabi_uidiv(void); extern void __aeabi_uidivmod(void); @@ -2082,7 +2139,7 @@ diff -Naur linux-3.1.10/arch/arm/kernel/armksyms.c linux-3.1.10.patch/arch/arm/k /* bitops */ diff -Naur linux-3.1.10/arch/arm/lib/divdi3.c linux-3.1.10.patch/arch/arm/lib/divdi3.c --- linux-3.1.10/arch/arm/lib/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/divdi3.c 2012-05-02 00:07:05.021250264 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/divdi3.c 2012-05-09 22:40:53.453537138 +0200 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -2424,7 +2481,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/divdi3.c linux-3.1.10.patch/arch/arm/lib/di +} diff -Naur linux-3.1.10/arch/arm/lib/lib1funcs.S linux-3.1.10.patch/arch/arm/lib/lib1funcs.S --- linux-3.1.10/arch/arm/lib/lib1funcs.S 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/lib1funcs.S 2012-05-02 00:07:05.022250284 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/lib1funcs.S 2012-05-09 22:40:53.454537158 +0200 @@ -349,6 +349,33 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) @@ -2461,7 +2518,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/lib1funcs.S linux-3.1.10.patch/arch/arm/lib Ldiv0: diff -Naur linux-3.1.10/arch/arm/lib/longlong.h linux-3.1.10.patch/arch/arm/lib/longlong.h --- linux-3.1.10/arch/arm/lib/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/longlong.h 2012-05-02 00:07:05.022250284 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/longlong.h 2012-05-09 22:40:53.454537158 +0200 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -2616,7 +2673,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/longlong.h linux-3.1.10.patch/arch/arm/lib/ +#define udiv_qrnnd __udiv_qrnnd_c diff -Naur linux-3.1.10/arch/arm/lib/Makefile linux-3.1.10.patch/arch/arm/lib/Makefile --- linux-3.1.10/arch/arm/lib/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/lib/Makefile 2012-05-02 00:07:05.021250264 +0200 ++++ linux-3.1.10.patch/arch/arm/lib/Makefile 2012-05-09 22:40:53.453537137 +0200 @@ -13,7 +13,8 @@ testchangebit.o testclearbit.o testsetbit.o \ ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ @@ -2629,7 +2686,7 @@ diff -Naur linux-3.1.10/arch/arm/lib/Makefile linux-3.1.10.patch/arch/arm/lib/Ma diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c --- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c 2012-05-02 00:07:05.024250324 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c 2012-05-09 22:40:53.456537198 +0200 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -3032,7 +3089,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c linux-3.1.10.patch/arch/ +} diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h --- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h 2012-05-02 00:07:05.025250344 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h 2012-05-09 22:40:53.457537219 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -3063,7 +3120,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h linux-3.1.10.patch/arch/ +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-05-02 00:07:05.493259762 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-05-09 22:40:54.869565857 +0200 @@ -0,0 +1,649 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3716,7 +3773,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/ +module_param(serial, uint, 0644); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-05-02 00:07:05.027250384 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-05-09 22:40:53.459537261 +0200 @@ -0,0 +1,323 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4043,7 +4100,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.1.10.patch/ + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-05-02 00:07:05.026250364 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-05-09 22:40:53.458537240 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4098,7 +4155,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h linux-3.1.10.patch/arch/ +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.c linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c --- linux-3.1.10/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c 2012-05-02 00:07:05.027250384 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c 2012-05-09 22:40:53.460537281 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4163,7 +4220,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.c linux-3.1.10.patch/arch/ar +EXPORT_SYMBOL(clk_set_rate); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.h linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h --- linux-3.1.10/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h 2012-05-02 00:07:05.028250404 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h 2012-05-09 22:40:53.460537281 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4191,7 +4248,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.h linux-3.1.10.patch/arch/ar +}; diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/dma.c linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c --- linux-3.1.10/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c 2012-05-02 00:07:05.029250424 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c 2012-05-09 22:40:53.461537301 +0200 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4592,7 +4649,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/dma.c linux-3.1.10.patch/arch/arm/ +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-05-02 00:07:05.030250444 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-05-09 22:40:53.462537321 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5015,7 +5072,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-05-02 00:07:05.031250464 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-05-09 22:40:53.463537341 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5079,7 +5136,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.1 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-05-02 00:07:05.031250464 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-05-09 22:40:53.463537341 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5090,7 +5147,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-05-02 00:07:05.031250464 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-05-09 22:40:53.463537341 +0200 @@ -0,0 +1,24 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5118,7 +5175,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3 +#include diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-05-02 00:07:05.032250484 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-05-09 22:40:53.464537361 +0200 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5206,7 +5263,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.1.10.pa +#endif /* _MACH_BCM2708_DMA_H */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-05-02 00:07:05.032250484 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-05-09 22:40:53.464537361 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5279,7 +5336,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3 + .endm diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-05-02 00:07:05.032250484 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-05-09 22:40:53.464537361 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5321,7 +5378,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.1.10.pa +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-05-02 00:07:05.033250504 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-05-09 22:40:53.465537381 +0200 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5373,7 +5430,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-05-02 00:07:05.033250504 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-05-09 22:40:53.465537381 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5405,7 +5462,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.1. +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-05-02 00:07:05.034250524 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-05-09 22:40:53.466537401 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5437,7 +5494,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-05-02 00:07:05.035250544 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-05-09 22:40:53.466537401 +0200 @@ -0,0 +1,190 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5631,7 +5688,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1.10.p +#endif /* _BCM2708_IRQS_H_ */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-05-02 00:07:05.035250544 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-05-09 22:40:53.467537421 +0200 @@ -0,0 +1,185 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5820,7 +5877,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.1 +#define NR_IRQS (64 + 21) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-05-02 00:07:05.397257829 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-05-09 22:40:54.823564923 +0200 @@ -0,0 +1,64 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5888,7 +5945,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-05-02 00:07:05.036250564 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-05-09 22:40:53.468537441 +0200 @@ -0,0 +1,210 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6102,7 +6159,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.1. +/* END */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig 2012-05-02 00:07:05.037250585 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig 2012-05-09 22:40:53.469537461 +0200 @@ -0,0 +1,210 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6316,7 +6373,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux +/* END */ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-05-02 00:07:05.037250585 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-05-09 22:40:53.469537461 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6346,7 +6403,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1.10. +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-05-02 00:07:05.038250605 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-05-09 22:40:53.469537461 +0200 @@ -0,0 +1,53 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6403,7 +6460,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h linux-3.1.10 +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-05-02 00:07:05.038250605 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-05-09 22:40:53.470537481 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6430,7 +6487,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1.10. +#define CLOCK_TICK_RATE (1000000) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-05-02 00:07:05.039250625 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-05-09 22:40:53.470537481 +0200 @@ -0,0 +1,49 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6483,7 +6540,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3. +#define arch_decomp_wdog() diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-05-02 00:07:05.039250625 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-05-09 22:40:53.471537502 +0200 @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6529,7 +6586,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-05-02 00:07:05.471259319 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-05-09 22:40:54.860565674 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6568,7 +6625,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.1.10 + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-05-02 00:07:05.040250645 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-05-09 22:40:53.471537502 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6592,7 +6649,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.1.1 +#define VMALLOC_END (0xd8000000) diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Kconfig linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig --- linux-3.1.10/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig 2012-05-02 00:07:05.397257829 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig 2012-05-09 22:40:54.823564923 +0200 @@ -0,0 +1,32 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6628,7 +6685,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Kconfig linux-3.1.10.patch/arch/ar +endmenu diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile --- linux-3.1.10/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile 2012-05-02 00:07:05.023250304 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile 2012-05-09 22:40:53.455537178 +0200 @@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. @@ -6640,14 +6697,14 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile linux-3.1.10.patch/arch/a + diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-05-02 00:07:05.024250324 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-05-09 22:40:53.455537178 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c --- linux-3.1.10/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c 2012-05-02 00:07:05.402257930 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c 2012-05-09 22:40:54.827565003 +0200 @@ -0,0 +1,195 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -6846,7 +6903,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/ar +MODULE_LICENSE("GPL"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c --- linux-3.1.10/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c 2012-05-02 00:07:05.042250685 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c 2012-05-09 22:40:53.473537544 +0200 @@ -0,0 +1,309 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7159,7 +7216,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm +MODULE_ALIAS("platform:bcm-mbox"); diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-05-02 00:07:05.474259379 +0200 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-05-09 22:40:54.863565734 +0200 @@ -0,0 +1,466 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7629,7 +7686,7 @@ diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c linux-3.1.10.patch/arch/a +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.1.10/arch/arm/Makefile linux-3.1.10.patch/arch/arm/Makefile --- linux-3.1.10/arch/arm/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/Makefile 2012-05-02 00:07:04.993249700 +0200 ++++ linux-3.1.10.patch/arch/arm/Makefile 2012-05-09 22:40:53.445536974 +0200 @@ -196,6 +196,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -7640,7 +7697,7 @@ diff -Naur linux-3.1.10/arch/arm/Makefile linux-3.1.10.patch/arch/arm/Makefile # by CONFIG_* macro name. diff -Naur linux-3.1.10/arch/arm/mm/alignment.c linux-3.1.10.patch/arch/arm/mm/alignment.c --- linux-3.1.10/arch/arm/mm/alignment.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/alignment.c 2012-05-02 00:07:05.043250705 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/alignment.c 2012-05-09 22:40:53.475537584 +0200 @@ -855,9 +855,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -7657,7 +7714,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/alignment.c linux-3.1.10.patch/arch/arm/mm/a goto bad; diff -Naur linux-3.1.10/arch/arm/mm/Kconfig linux-3.1.10.patch/arch/arm/mm/Kconfig --- linux-3.1.10/arch/arm/mm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/Kconfig 2012-05-02 00:07:05.043250705 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/Kconfig 2012-05-09 22:40:53.474537564 +0200 @@ -390,7 +390,7 @@ # ARMv6 @@ -7669,7 +7726,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/Kconfig linux-3.1.10.patch/arch/arm/mm/Kconf select CPU_PABRT_V6 diff -Naur linux-3.1.10/arch/arm/mm/proc-v6.S linux-3.1.10.patch/arch/arm/mm/proc-v6.S --- linux-3.1.10/arch/arm/mm/proc-v6.S 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/arch/arm/mm/proc-v6.S 2012-05-02 00:07:05.050250847 +0200 ++++ linux-3.1.10.patch/arch/arm/mm/proc-v6.S 2012-05-09 22:40:53.475537584 +0200 @@ -70,10 +70,19 @@ * * IRQs are already disabled. @@ -7695,7 +7752,7 @@ diff -Naur linux-3.1.10/arch/arm/mm/proc-v6.S linux-3.1.10.patch/arch/arm/mm/pro ENTRY(cpu_v6_dcache_clean_area) diff -Naur linux-3.1.10/drivers/misc/Kconfig linux-3.1.10.patch/drivers/misc/Kconfig --- linux-3.1.10/drivers/misc/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/Kconfig 2012-05-02 00:07:05.183253524 +0200 ++++ linux-3.1.10.patch/drivers/misc/Kconfig 2012-05-09 22:40:54.735563139 +0200 @@ -507,5 +507,6 @@ source "drivers/misc/ti-st/Kconfig" source "drivers/misc/lis3lv02d/Kconfig" @@ -7705,7 +7762,7 @@ diff -Naur linux-3.1.10/drivers/misc/Kconfig linux-3.1.10.patch/drivers/misc/Kco endif # MISC_DEVICES diff -Naur linux-3.1.10/drivers/misc/Makefile linux-3.1.10.patch/drivers/misc/Makefile --- linux-3.1.10/drivers/misc/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/Makefile 2012-05-02 00:07:05.183253524 +0200 ++++ linux-3.1.10.patch/drivers/misc/Makefile 2012-05-09 22:40:54.749563423 +0200 @@ -47,3 +47,4 @@ obj-y += lis3lv02d/ obj-y += carma/ @@ -7713,7 +7770,7 @@ diff -Naur linux-3.1.10/drivers/misc/Makefile linux-3.1.10.patch/drivers/misc/Ma +obj-y += vc04_services/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-05-02 00:07:05.407258031 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-05-09 22:40:54.832565106 +0200 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8026,7 +8083,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/connections/co +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-05-02 00:07:05.408258051 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-05-09 22:40:54.833565126 +0200 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8216,7 +8273,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/message_driver +/****************************** End of file ***********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-05-02 00:07:05.424258374 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-05-09 22:40:54.835565167 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8434,7 +8491,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-05-02 00:07:05.431258514 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-05-09 22:40:54.835565167 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8494,7 +8551,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +#endif /*VCHI_CFG_INTERNAL_H_*/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-05-02 00:07:05.432258534 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-05-09 22:40:54.836565187 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8650,7 +8707,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h +#endif // VCHI_COMMON_H_ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-05-02 00:07:05.409258071 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-05-09 22:40:54.834565147 +0200 @@ -0,0 +1,347 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9001,7 +9058,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3 +/****************************** End of file **********************************/ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-05-02 00:07:05.349256865 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-05-09 22:40:54.790564254 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -9032,7 +9089,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-05-02 00:07:05.433258554 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-05-09 22:40:54.837565207 +0200 @@ -0,0 +1,512 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9548,7 +9605,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-05-02 00:07:05.201253886 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-05-09 22:40:54.750563443 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -9579,7 +9636,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#endif /* VCHIQ_2835_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-05-02 00:07:05.494259782 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-05-09 22:40:54.870565877 +0200 @@ -0,0 +1,1912 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11495,7 +11552,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-05-02 00:07:05.442258737 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-05-09 22:40:54.839565247 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11617,7 +11674,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +#endif /* VCHIQ_ARM_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-05-02 00:07:05.212254108 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-05-09 22:40:54.751563463 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -11664,7 +11721,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif /* VCHIQ_CFG_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-05-02 00:07:05.212254108 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-05-09 22:40:54.752563484 +0200 @@ -0,0 +1,101 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -11769,7 +11826,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +EXPORT_SYMBOL( vchiq_add_connected_callback ); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-05-02 00:07:05.212254108 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-05-09 22:40:54.752563484 +0200 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -11805,7 +11862,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-05-02 00:07:05.496259822 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-05-09 22:40:54.871565897 +0200 @@ -0,0 +1,2717 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14526,7 +14583,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-05-02 00:07:05.497259842 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-05-09 22:40:54.872565917 +0200 @@ -0,0 +1,506 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15036,7 +15093,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-05-02 00:07:05.193253725 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-05-09 22:40:54.749563423 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15067,7 +15124,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-05-02 00:07:05.446258817 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-05-09 22:40:54.843565329 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15226,7 +15283,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +#endif /* VCHIQ_IF_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-05-02 00:07:05.497259842 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-05-09 22:40:54.873565938 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15335,7 +15392,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-05-02 00:07:05.226254389 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-05-09 22:40:54.756563565 +0200 @@ -0,0 +1,297 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -15636,7 +15693,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +EXPORT_SYMBOL(vchiq_open_service_params); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-05-02 00:07:05.447258837 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-05-09 22:40:54.844565350 +0200 @@ -0,0 +1,1628 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17268,7 +17325,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-05-02 00:07:05.254254953 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-05-09 22:40:54.759563625 +0200 @@ -0,0 +1,45 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -17317,7 +17374,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-05-02 00:07:05.255254973 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-05-09 22:40:54.759563625 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17364,7 +17421,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +#endif /* VCHIQ_PAGELIST_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-05-02 00:07:05.448258857 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-05-09 22:40:54.845565370 +0200 @@ -0,0 +1,1001 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18369,7 +18426,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-05-02 00:07:05.257255013 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-05-09 22:40:54.761563665 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18470,7 +18527,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-05-02 00:07:05.257255013 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-05-09 22:40:54.762563685 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -18521,7 +18578,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-05-02 00:07:05.259255053 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-05-09 22:40:54.763563705 +0200 @@ -0,0 +1,681 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -19206,7 +19263,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-05-02 00:07:05.349256865 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-05-09 22:40:54.791564275 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19297,7 +19354,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-05-02 00:07:05.350256885 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-05-09 22:40:54.791564275 +0200 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19572,7 +19629,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-05-02 00:07:05.350256885 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-05-09 22:40:54.792564295 +0200 @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19887,7 +19944,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-05-02 00:07:05.351256905 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-05-09 22:40:54.792564295 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20009,7 +20066,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-05-02 00:07:05.351256905 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-05-09 22:40:54.793564315 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20105,7 +20162,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-05-02 00:07:05.352256925 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-05-09 22:40:54.793564315 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20195,7 +20252,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-05-02 00:07:05.352256925 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-05-09 22:40:54.794564335 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20285,7 +20342,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-05-02 00:07:05.353256945 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-05-09 22:40:54.794564335 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20444,7 +20501,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_g + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-05-02 00:07:05.353256945 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-05-09 22:40:54.795564356 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20662,7 +20719,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_j +#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-05-02 00:07:05.354256965 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-05-09 22:40:54.795564356 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20725,7 +20782,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-05-02 00:07:05.354256965 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-05-09 22:40:54.796564376 +0200 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21289,7 +21346,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-05-02 00:07:05.355256985 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-05-09 22:40:54.796564376 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21377,7 +21434,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-05-02 00:07:05.356257005 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-05-09 22:40:54.797564396 +0200 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21446,7 +21503,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-05-02 00:07:05.356257005 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-05-09 22:40:54.797564396 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21529,7 +21586,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-05-02 00:07:05.357257025 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-05-09 22:40:54.798564416 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21579,7 +21636,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_t + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-05-02 00:07:05.357257025 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-05-09 22:40:54.798564416 +0200 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21614,7 +21671,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/st +#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-05-02 00:07:05.357257025 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-05-09 22:40:54.799564436 +0200 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22245,7 +22302,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +EXPORT_SYMBOL( vcos_strdup ); diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-05-02 00:07:05.269255253 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-05-09 22:40:54.773563909 +0200 @@ -0,0 +1,332 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22581,7 +22638,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-05-02 00:07:05.358257045 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-05-09 22:40:54.799564436 +0200 @@ -0,0 +1,111 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22696,7 +22753,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +// ############################################################################# diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-05-02 00:07:05.270255274 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-05-09 22:40:54.774563929 +0200 @@ -0,0 +1,64 @@ +/***************************************************************************** +* Copyright 2006 - 2008 Broadcom Corporation. All rights reserved. @@ -22764,7 +22821,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-05-02 00:07:05.359257065 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-05-09 22:40:54.800564456 +0200 @@ -0,0 +1,507 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23275,7 +23332,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-05-02 00:07:05.359257065 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-05-09 22:40:54.800564456 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23337,7 +23394,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-05-02 00:07:05.272255314 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-05-09 22:40:54.776563971 +0200 @@ -0,0 +1,129 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -23470,7 +23527,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +} diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-05-02 00:07:05.272255314 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-05-09 22:40:54.777563991 +0200 @@ -0,0 +1,39 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -23513,7 +23570,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#endif /*VCOS_THREAD_MAP_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-05-02 00:07:05.360257085 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-05-09 22:40:54.801564476 +0200 @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23797,7 +23854,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +#endif /* VCOS_ASSERT_H */ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-05-02 00:07:05.368257247 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-05-09 22:40:54.802564496 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23884,7 +23941,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_fl +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-05-02 00:07:05.369257266 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-05-09 22:40:54.802564496 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23911,7 +23968,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_inf + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-05-02 00:07:05.274255354 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-05-09 22:40:54.779564031 +0200 @@ -0,0 +1,113 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -24028,7 +24085,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-05-02 00:07:05.275255374 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-05-09 22:40:54.780564051 +0200 @@ -0,0 +1,98 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -24130,7 +24187,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-05-02 00:07:05.369257266 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-05-09 22:40:54.802564496 +0200 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24174,7 +24231,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-05-02 00:07:05.369257266 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-05-09 22:40:54.803564517 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24258,7 +24315,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-05-02 00:07:05.370257285 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-05-09 22:40:54.804564538 +0200 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24371,7 +24428,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_fla + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-05-02 00:07:05.370257285 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-05-09 22:40:54.803564517 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24483,7 +24540,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h l + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-05-02 00:07:05.360257085 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-05-09 22:40:54.801564476 +0200 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24699,7 +24756,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3 + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-05-02 00:07:05.371257305 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-05-09 22:40:54.804564538 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24757,7 +24814,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h li + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-05-02 00:07:05.371257305 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-05-09 22:40:54.805564559 +0200 @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25051,7 +25108,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-05-02 00:07:05.372257326 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-05-09 22:40:54.805564559 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25173,7 +25230,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_ + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-05-02 00:07:05.372257326 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-05-09 22:40:54.806564579 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25269,7 +25326,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h lin + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-05-02 00:07:05.373257347 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-05-09 22:40:54.806564579 +0200 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25441,7 +25498,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue. + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-05-02 00:07:05.381257509 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-05-09 22:40:54.807564599 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25548,7 +25605,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-05-02 00:07:05.382257529 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-05-09 22:40:54.807564599 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25605,7 +25662,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h li + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-05-02 00:07:05.382257529 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-05-09 22:40:54.808564619 +0200 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25735,7 +25792,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-05-02 00:07:05.382257529 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-05-09 22:40:54.808564619 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25773,7 +25830,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-05-02 00:07:05.383257549 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-05-09 22:40:54.809564640 +0200 @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25980,7 +26037,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h + diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-05-02 00:07:05.384257569 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-05-09 22:40:54.809564640 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26068,7 +26125,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-05-02 00:07:05.385257589 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-05-09 22:40:54.810564660 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26159,7 +26216,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_at +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-05-02 00:07:05.384257569 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-05-09 22:40:54.810564660 +0200 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26433,7 +26490,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-05-02 00:07:05.385257589 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-05-09 22:40:54.811564680 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26543,7 +26600,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h --- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-05-02 00:07:05.386257609 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-05-09 22:40:54.811564680 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -26758,7 +26815,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h l +#endif diff -Naur linux-3.1.10/drivers/misc/vc04_services/Kconfig linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig --- linux-3.1.10/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig 2012-05-02 00:07:05.192253704 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig 2012-05-09 22:40:54.749563423 +0200 @@ -0,0 +1,7 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -26769,7 +26826,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/Kconfig linux-3.1.10.patch/dr + diff -Naur linux-3.1.10/drivers/misc/vc04_services/Makefile linux-3.1.10.patch/drivers/misc/vc04_services/Makefile --- linux-3.1.10/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/misc/vc04_services/Makefile 2012-05-02 00:07:05.406258011 +0200 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Makefile 2012-05-09 22:40:54.831565086 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -26794,7 +26851,7 @@ diff -Naur linux-3.1.10/drivers/misc/vc04_services/Makefile linux-3.1.10.patch/d + diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.c linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c --- linux-3.1.10/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c 2012-05-02 00:07:05.067251190 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c 2012-05-09 22:40:53.477537625 +0200 @@ -0,0 +1,889 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -27687,7 +27744,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.c linux-3.1.10.patch/driver +MODULE_ALIAS("platform:bcm2708_mci"); diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.h linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h --- linux-3.1.10/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h 2012-05-02 00:07:05.067251190 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h 2012-05-09 22:40:53.477537625 +0200 @@ -0,0 +1,101 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -27792,7 +27849,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.h linux-3.1.10.patch/driver +} diff -Naur linux-3.1.10/drivers/mmc/host/Kconfig linux-3.1.10.patch/drivers/mmc/host/Kconfig --- linux-3.1.10/drivers/mmc/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/Kconfig 2012-05-02 00:07:05.065251149 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/Kconfig 2012-05-09 22:40:53.476537604 +0200 @@ -229,6 +229,27 @@ YMMV. @@ -27838,7 +27895,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/Kconfig linux-3.1.10.patch/drivers/mmc/ bool "Atmel MCI DMA support" diff -Naur linux-3.1.10/drivers/mmc/host/Makefile linux-3.1.10.patch/drivers/mmc/host/Makefile --- linux-3.1.10/drivers/mmc/host/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/Makefile 2012-05-02 00:07:05.065251149 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/Makefile 2012-05-09 22:40:53.476537604 +0200 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -27857,8 +27914,8 @@ diff -Naur linux-3.1.10/drivers/mmc/host/Makefile linux-3.1.10.patch/drivers/mmc obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-02 00:07:05.475259399 +0200 -@@ -0,0 +1,1555 @@ ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-09 22:40:54.879566060 +0200 +@@ -0,0 +1,1564 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 + * Copyright (c) 2010 Broadcom @@ -29152,6 +29209,14 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + return 1; +} + ++static unsigned int sdhci_bcm2708_missing_status(struct sdhci_host *host) ++{ ++ if(host->last_cmdop == MMC_SEND_STATUS) ++ return 1; ++ else ++ return 0; ++} ++ +/***************************************************************************** \ + * * + * Device ops * @@ -29189,6 +29254,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + .spurious_crc_acmd51 = sdhci_bcm2708_quirk_spurious_crc, + .voltage_broken = sdhci_bcm2708_quirk_voltage_broken, + .uhs_broken = sdhci_bcm2708_uhs_broken, ++ .missing_status = sdhci_bcm2708_missing_status, +}; + +/*****************************************************************************\ @@ -29416,7 +29482,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/driv + diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/host/sdhci.c --- linux-3.1.10/drivers/mmc/host/sdhci.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci.c 2012-05-02 00:07:05.405257990 +0200 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.c 2012-05-09 22:40:54.881566100 +0200 @@ -16,15 +16,18 @@ #include #include @@ -29767,7 +29833,19 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } /* -@@ -949,7 +974,7 @@ +@@ -942,6 +967,11 @@ + if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY)) + mask |= SDHCI_DATA_INHIBIT; + ++ if(host->ops->missing_status && (cmd->opcode == MMC_SEND_STATUS)) { ++ timeout = 100; ++ mask |= SDHCI_DATA_INHIBIT; ++ } ++ + /* We shouldn't wait for data inihibit for stop commands, even + though they might use busy signaling */ + if (host->mrq->data && (cmd == host->mrq->data->stop)) +@@ -949,7 +979,7 @@ while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { if (timeout == 0) { @@ -29776,7 +29854,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "inhibit bit(s).\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); cmd->error = -EIO; -@@ -959,10 +984,16 @@ +@@ -959,10 +989,16 @@ timeout--; mdelay(1); } @@ -29793,7 +29871,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ sdhci_prepare_data(host, cmd); -@@ -971,7 +1002,7 @@ +@@ -971,7 +1007,7 @@ sdhci_set_transfer_mode(host, cmd); if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) { @@ -29802,7 +29880,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc)); cmd->error = -EINVAL; tasklet_schedule(&host->finish_tasklet); -@@ -1121,7 +1152,7 @@ +@@ -1121,7 +1157,7 @@ while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) & SDHCI_CLOCK_INT_STABLE)) { if (timeout == 0) { @@ -29811,7 +29889,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "stabilised.\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); return; -@@ -1195,6 +1226,35 @@ +@@ -1195,6 +1231,35 @@ mdelay(10); } @@ -29847,7 +29925,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /*****************************************************************************\ * * * MMC callbacks * -@@ -1209,6 +1269,8 @@ +@@ -1209,6 +1274,8 @@ host = mmc_priv(mmc); @@ -29856,7 +29934,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ spin_lock_irqsave(&host->lock, flags); WARN_ON(host->mrq != NULL); -@@ -1269,13 +1331,11 @@ +@@ -1269,13 +1336,11 @@ spin_unlock_irqrestore(&host->lock, flags); } @@ -29872,7 +29950,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ spin_lock_irqsave(&host->lock, flags); -@@ -1334,7 +1394,7 @@ +@@ -1334,7 +1399,7 @@ else ctrl &= ~SDHCI_CTRL_HISPD; @@ -29881,7 +29959,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ u16 clk, ctrl_2; unsigned int clock; -@@ -1424,9 +1484,24 @@ +@@ -1424,9 +1489,24 @@ out: mmiowb(); spin_unlock_irqrestore(&host->lock, flags); @@ -29891,8 +29969,9 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ + rc = sdhci_set_plat_power(host, ios->power_mode); + while (rc == -EINTR); + } -+} -+ + } + +-static int check_ro(struct sdhci_host *host) +static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct sdhci_host *host = mmc_priv(mmc); @@ -29900,14 +29979,13 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ + sdhci_runtime_pm_get(host); + sdhci_do_set_ios(host, ios); + sdhci_runtime_pm_put(host); - } - --static int check_ro(struct sdhci_host *host) ++} ++ +static int sdhci_check_ro(struct sdhci_host *host) { unsigned long flags; int is_readonly; -@@ -1450,19 +1525,16 @@ +@@ -1450,19 +1530,16 @@ #define SAMPLE_COUNT 5 @@ -29930,7 +30008,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (++ro_count > SAMPLE_COUNT / 2) return 1; } -@@ -1471,38 +1543,64 @@ +@@ -1471,38 +1548,64 @@ return 0; } @@ -29951,13 +30029,13 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ +{ + struct sdhci_host *host = mmc_priv(mmc); + int ret; -+ + + sdhci_runtime_pm_get(host); + ret = sdhci_do_get_ro(host); + sdhci_runtime_pm_put(host); + return ret; +} - ++ +static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable) +{ if (host->flags & SDHCI_DEVICE_DEAD) @@ -29979,12 +30057,12 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ out: mmiowb(); +} - ++ +static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) +{ + struct sdhci_host *host = mmc_priv(mmc); + unsigned long flags; -+ + + spin_lock_irqsave(&host->lock, flags); + sdhci_enable_sdio_irq_nolock(host, enable); spin_unlock_irqrestore(&host->lock, flags); @@ -30005,7 +30083,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* * Signal Voltage Switching is only applicable for Host Controllers * v3.00 and above. -@@ -1528,7 +1626,7 @@ +@@ -1528,7 +1631,7 @@ if (!(ctrl & SDHCI_CTRL_VDD_180)) return 0; else { @@ -30014,7 +30092,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "signalling voltage failed\n"); return -EIO; } -@@ -1587,7 +1685,7 @@ +@@ -1587,7 +1690,7 @@ pwr |= SDHCI_POWER_ON; sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); @@ -30023,7 +30101,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "voltage failed, retrying with S18R set to 0\n"); return -EAGAIN; } else -@@ -1595,6 +1693,20 @@ +@@ -1595,6 +1698,20 @@ return 0; } @@ -30044,7 +30122,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ static int sdhci_execute_tuning(struct mmc_host *mmc) { struct sdhci_host *host; -@@ -1606,6 +1718,7 @@ +@@ -1606,6 +1723,7 @@ host = mmc_priv(mmc); @@ -30052,7 +30130,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ disable_irq(host->irq); spin_lock(&host->lock); -@@ -1623,6 +1736,7 @@ +@@ -1623,6 +1741,7 @@ else { spin_unlock(&host->lock); enable_irq(host->irq); @@ -30060,7 +30138,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return 0; } -@@ -1648,7 +1762,7 @@ +@@ -1648,7 +1767,7 @@ timeout = 150; do { struct mmc_command cmd = {0}; @@ -30069,7 +30147,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (!tuning_loop_counter && !timeout) break; -@@ -1694,7 +1808,7 @@ +@@ -1694,7 +1813,7 @@ spin_lock(&host->lock); if (!host->tuning_done) { @@ -30078,7 +30156,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "Buffer Read Ready interrupt during tuning " "procedure, falling back to fixed sampling " "clock\n"); -@@ -1724,7 +1838,7 @@ +@@ -1724,7 +1843,7 @@ sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); } else { if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) { @@ -30087,7 +30165,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ " failed, falling back to fixed sampling" " clock\n"); err = -EIO; -@@ -1766,18 +1880,16 @@ +@@ -1766,18 +1885,16 @@ sdhci_clear_set_irqs(host, SDHCI_INT_DATA_AVAIL, ier); spin_unlock(&host->lock); enable_irq(host->irq); @@ -30108,7 +30186,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* Host Controller v3.00 defines preset value registers */ if (host->version < SDHCI_SPEC_300) return; -@@ -1793,22 +1905,36 @@ +@@ -1793,22 +1910,36 @@ if (enable && !(ctrl & SDHCI_CTRL_PRESET_VAL_ENABLE)) { ctrl |= SDHCI_CTRL_PRESET_VAL_ENABLE; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); @@ -30145,7 +30223,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ }; /*****************************************************************************\ -@@ -1826,19 +1952,19 @@ +@@ -1826,19 +1957,19 @@ spin_lock_irqsave(&host->lock, flags); @@ -30176,7 +30254,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } spin_unlock_irqrestore(&host->lock, flags); -@@ -1854,14 +1980,16 @@ +@@ -1854,14 +1985,16 @@ host = (struct sdhci_host*)param; @@ -30196,7 +30274,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ del_timer(&host->timer); -@@ -1905,6 +2033,7 @@ +@@ -1905,6 +2038,7 @@ spin_unlock_irqrestore(&host->lock, flags); mmc_request_done(host->mmc, mrq); @@ -30204,7 +30282,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } static void sdhci_timeout_timer(unsigned long data) -@@ -1917,7 +2046,7 @@ +@@ -1917,7 +2051,7 @@ spin_lock_irqsave(&host->lock, flags); if (host->mrq) { @@ -30213,7 +30291,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "interrupt.\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); -@@ -1963,10 +2092,13 @@ +@@ -1963,10 +2097,13 @@ BUG_ON(intmask == 0); if (!host->cmd) { @@ -30231,7 +30309,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return; } -@@ -2036,6 +2168,19 @@ +@@ -2036,6 +2173,19 @@ static void sdhci_show_adma_error(struct sdhci_host *host) { } #endif @@ -30251,7 +30329,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) { BUG_ON(intmask == 0); -@@ -2062,34 +2207,56 @@ +@@ -2062,34 +2212,56 @@ return; } } @@ -30324,7 +30402,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* * We currently don't do anything fancy with DMA -@@ -2118,30 +2285,27 @@ +@@ -2118,30 +2290,27 @@ sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); } @@ -30365,7 +30443,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ intmask = sdhci_readl(host, SDHCI_INT_STATUS); if (!intmask || intmask == 0xffffffff) { -@@ -2177,6 +2341,22 @@ +@@ -2177,6 +2346,22 @@ tasklet_schedule(&host->card_tasklet); } @@ -30388,7 +30466,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (intmask & SDHCI_INT_CMD_MASK) { sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, SDHCI_INT_STATUS); -@@ -2191,10 +2371,16 @@ +@@ -2191,10 +2376,16 @@ intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); @@ -30407,7 +30485,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc)); sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS); } -@@ -2207,7 +2393,7 @@ +@@ -2207,7 +2398,7 @@ intmask &= ~SDHCI_INT_CARD_INT; if (intmask) { @@ -30416,7 +30494,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc_hostname(host->mmc), intmask); sdhci_dumpregs(host); -@@ -2275,8 +2461,8 @@ +@@ -2275,8 +2466,8 @@ return ret; } @@ -30427,7 +30505,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ if (host->ops->enable_dma) host->ops->enable_dma(host); } -@@ -2314,6 +2500,90 @@ +@@ -2314,6 +2505,90 @@ #endif /* CONFIG_PM */ @@ -30518,7 +30596,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /*****************************************************************************\ * * * Device allocation/registration * -@@ -2356,6 +2626,8 @@ +@@ -2356,6 +2631,8 @@ if (debug_quirks) host->quirks = debug_quirks; @@ -30527,7 +30605,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ sdhci_reset(host, SDHCI_RESET_ALL); -@@ -2363,7 +2635,7 @@ +@@ -2363,7 +2640,7 @@ host->version = (host->version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; if (host->version > SDHCI_SPEC_300) { @@ -30536,7 +30614,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "You may experience problems.\n", mmc_hostname(mmc), host->version); } -@@ -2397,14 +2669,16 @@ +@@ -2397,14 +2674,16 @@ host->flags &= ~SDHCI_USE_ADMA; } @@ -30556,7 +30634,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ } } } -@@ -2420,7 +2694,7 @@ +@@ -2420,7 +2699,7 @@ if (!host->adma_desc || !host->align_buffer) { kfree(host->adma_desc); kfree(host->align_buffer); @@ -30565,7 +30643,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "buffers. Falling back to standard DMA.\n", mmc_hostname(mmc)); host->flags &= ~SDHCI_USE_ADMA; -@@ -2448,8 +2722,7 @@ +@@ -2448,8 +2727,7 @@ if (host->max_clk == 0 || host->quirks & SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) { if (!host->ops->get_max_clock) { @@ -30575,7 +30653,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "frequency.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2495,8 +2768,7 @@ +@@ -2495,8 +2773,7 @@ host->timeout_clk = host->ops->get_timeout_clock(host); } else if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) { @@ -30585,7 +30663,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "frequency.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2517,7 +2789,7 @@ +@@ -2517,7 +2794,7 @@ /* Auto-CMD23 stuff only works in ADMA or PIO. */ if ((host->version >= SDHCI_SPEC_300) && ((host->flags & SDHCI_USE_ADMA) || @@ -30594,7 +30672,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ host->flags |= SDHCI_AUTO_CMD23; DBG("%s: Auto-CMD23 available\n", mmc_hostname(mmc)); } else { -@@ -2566,6 +2838,15 @@ +@@ -2566,6 +2843,15 @@ if (caps[1] & SDHCI_DRIVER_TYPE_D) mmc->caps |= MMC_CAP_DRIVER_TYPE_D; @@ -30610,7 +30688,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ /* Initial value for re-tuning timer count */ host->tuning_count = (caps[1] & SDHCI_RETUNING_TIMER_COUNT_MASK) >> SDHCI_RETUNING_TIMER_COUNT_SHIFT; -@@ -2641,6 +2922,12 @@ +@@ -2641,6 +2927,12 @@ mmc->caps |= MMC_CAP_MAX_CURRENT_200; } @@ -30623,7 +30701,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) -@@ -2655,7 +2942,7 @@ +@@ -2655,7 +2947,7 @@ mmc->ocr_avail_mmc &= host->ocr_avail_mmc; if (mmc->ocr_avail == 0) { @@ -30632,7 +30710,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "support voltages.\n", mmc_hostname(mmc)); return -ENODEV; } -@@ -2703,7 +2990,7 @@ +@@ -2703,7 +2995,7 @@ mmc->max_blk_size = (caps[0] & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT; if (mmc->max_blk_size >= 3) { @@ -30641,7 +30719,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ "assuming 512 bytes\n", mmc_hostname(mmc)); mmc->max_blk_size = 0; } -@@ -2742,7 +3029,7 @@ +@@ -2742,7 +3034,7 @@ host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); if (IS_ERR(host->vmmc)) { @@ -30650,7 +30728,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ host->vmmc = NULL; } else { regulator_enable(host->vmmc); -@@ -2771,8 +3058,9 @@ +@@ -2771,8 +3063,9 @@ mmc_add_host(mmc); @@ -30661,7 +30739,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -@@ -2804,7 +3092,7 @@ +@@ -2804,7 +3097,7 @@ host->flags |= SDHCI_DEVICE_DEAD; if (host->mrq) { @@ -30670,7 +30748,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ " transfer!\n", mmc_hostname(host->mmc)); host->mrq->cmd->error = -ENOMEDIUM; -@@ -2863,9 +3151,9 @@ +@@ -2863,9 +3156,9 @@ static int __init sdhci_drv_init(void) { @@ -30682,7 +30760,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ return 0; } -@@ -2878,9 +3166,11 @@ +@@ -2878,9 +3171,11 @@ module_exit(sdhci_drv_exit); module_param(debug_quirks, uint, 0444); @@ -30696,8 +30774,8 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/ +MODULE_PARM_DESC(debug_quirks2, "Force certain other quirks."); diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/host/sdhci.h --- linux-3.1.10/drivers/mmc/host/sdhci.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/mmc/host/sdhci.h 2012-05-02 00:07:05.087251591 +0200 -@@ -274,6 +274,24 @@ ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.h 2012-05-09 22:40:54.881566100 +0200 +@@ -274,6 +274,25 @@ void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); @@ -30717,12 +30795,13 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/ + unsigned int (*spurious_crc_acmd51)(struct sdhci_host *host); + unsigned int (*voltage_broken)(struct sdhci_host *host); + unsigned int (*uhs_broken)(struct sdhci_host *host); ++ unsigned int (*missing_status)(struct sdhci_host *host); + + void (*hw_reset)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS -@@ -379,4 +397,32 @@ +@@ -379,4 +398,32 @@ extern void sdhci_enable_irq_wakeups(struct sdhci_host *host); #endif @@ -30757,7 +30836,7 @@ diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/ #endif /* __SDHCI_HW_H */ diff -Naur linux-3.1.10/drivers/net/usb/smsc95xx.c linux-3.1.10.patch/drivers/net/usb/smsc95xx.c --- linux-3.1.10/drivers/net/usb/smsc95xx.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/net/usb/smsc95xx.c 2012-05-02 00:07:05.348256845 +0200 ++++ linux-3.1.10.patch/drivers/net/usb/smsc95xx.c 2012-05-09 22:40:54.877566018 +0200 @@ -46,6 +46,7 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -30837,9 +30916,26 @@ diff -Naur linux-3.1.10/drivers/net/usb/smsc95xx.c linux-3.1.10.patch/drivers/ne /* try reading mac address from EEPROM */ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { +@@ -1016,6 +1072,7 @@ + dev->net->ethtool_ops = &smsc95xx_ethtool_ops; + dev->net->flags |= IFF_MULTICAST; + dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM; ++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; + return 0; + } + +@@ -1190,7 +1247,7 @@ + .rx_fixup = smsc95xx_rx_fixup, + .tx_fixup = smsc95xx_tx_fixup, + .status = smsc95xx_status, +- .flags = FLAG_ETHER | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR, + }; + + static const struct usb_device_id products[] = { diff -Naur linux-3.1.10/drivers/usb/core/generic.c linux-3.1.10.patch/drivers/usb/core/generic.c --- linux-3.1.10/drivers/usb/core/generic.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/generic.c 2012-05-02 00:07:04.667243140 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/generic.c 2012-05-09 22:40:48.191430416 +0200 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -30850,7 +30946,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/generic.c linux-3.1.10.patch/drivers/us } diff -Naur linux-3.1.10/drivers/usb/core/hub.c linux-3.1.10.patch/drivers/usb/core/hub.c --- linux-3.1.10/drivers/usb/core/hub.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/hub.c 2012-05-02 00:07:04.671243220 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/hub.c 2012-05-09 22:40:49.768462401 +0200 @@ -1071,6 +1071,8 @@ INIT_WORK(&hub->tt.clear_work, hub_tt_work); switch (hdev->descriptor.bDeviceProtocol) { @@ -30966,7 +31062,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/hub.c linux-3.1.10.patch/drivers/usb/co !hcd->driver->port_handed_over || diff -Naur linux-3.1.10/drivers/usb/core/message.c linux-3.1.10.patch/drivers/usb/core/message.c --- linux-3.1.10/drivers/usb/core/message.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/message.c 2012-05-02 00:07:04.680243401 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/message.c 2012-05-09 22:40:50.635479982 +0200 @@ -1836,6 +1836,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -31055,7 +31151,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/message.c linux-3.1.10.patch/drivers/us * to trigger binding of drivers to interfaces. probe() diff -Naur linux-3.1.10/drivers/usb/core/otg_whitelist.h linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h --- linux-3.1.10/drivers/usb/core/otg_whitelist.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h 2012-05-02 00:07:04.688243562 +0200 ++++ linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h 2012-05-09 22:40:51.297493412 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -31273,7 +31369,7 @@ diff -Naur linux-3.1.10/drivers/usb/core/otg_whitelist.h linux-3.1.10.patch/driv diff -Naur linux-3.1.10/drivers/usb/gadget/file_storage.c linux-3.1.10.patch/drivers/usb/gadget/file_storage.c --- linux-3.1.10/drivers/usb/gadget/file_storage.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/gadget/file_storage.c 2012-05-02 00:07:04.691243622 +0200 ++++ linux-3.1.10.patch/drivers/usb/gadget/file_storage.c 2012-05-09 22:40:52.790523692 +0200 @@ -572,8 +572,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -31397,7 +31493,7 @@ diff -Naur linux-3.1.10/drivers/usb/gadget/file_storage.c linux-3.1.10.patch/dri if (!req) diff -Naur linux-3.1.10/drivers/usb/gadget/Kconfig linux-3.1.10.patch/drivers/usb/gadget/Kconfig --- linux-3.1.10/drivers/usb/gadget/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/gadget/Kconfig 2012-05-02 00:07:05.498259862 +0200 ++++ linux-3.1.10.patch/drivers/usb/gadget/Kconfig 2012-05-09 22:40:54.873565938 +0200 @@ -525,6 +525,12 @@ depends on USB_GADGET depends on USB_GADGET_DUALSPEED @@ -31413,7 +31509,7 @@ diff -Naur linux-3.1.10/drivers/usb/gadget/Kconfig linux-3.1.10.patch/drivers/us # diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-05-02 00:07:04.753244870 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-05-09 22:40:53.375535562 +0200 @@ -0,0 +1,506 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.c $ @@ -31923,7 +32019,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1.10.p +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-05-02 00:07:04.762245050 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-05-09 22:40:53.375535562 +0200 @@ -0,0 +1,209 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.h $ @@ -32136,7 +32232,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1.10.p + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-05-02 00:07:04.763245070 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-05-09 22:40:53.376535578 +0200 @@ -0,0 +1,1247 @@ +#include "dwc_cc.h" +#include "dwc_modpow.h" @@ -33387,7 +33483,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +EXPORT_SYMBOL(DWC_WAITQ_ABORT); diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-05-02 00:07:04.764245091 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-05-09 22:40:53.377535593 +0200 @@ -0,0 +1,306 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.c $ @@ -33697,7 +33793,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.1. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-05-02 00:07:04.764245091 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-05-09 22:40:53.377535593 +0200 @@ -0,0 +1,103 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.h $ @@ -33804,7 +33900,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.1. +#endif /* _DWC_CRYPTO_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-05-02 00:07:04.765245111 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-05-09 22:40:53.378535611 +0200 @@ -0,0 +1,286 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.c $ @@ -34094,7 +34190,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1.10.p +#endif /* CONFIG_IPMATE_MACH */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-05-02 00:07:04.766245131 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-05-09 22:40:53.378535611 +0200 @@ -0,0 +1,98 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.h $ @@ -34196,7 +34292,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1.10.p +#endif /* _DWC_DH_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-05-02 00:07:04.767245151 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-05-09 22:40:53.379535633 +0200 @@ -0,0 +1,616 @@ +/* $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 $ */ @@ -34816,7 +34912,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.1.10 +#endif /* !_SYS_QUEUE_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-05-02 00:07:04.767245151 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-05-09 22:40:53.379535633 +0200 @@ -0,0 +1,172 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -34992,7 +35088,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1.10. +#endif /* DEBUG_MEMORY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-05-02 00:07:04.811246037 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-05-09 22:40:53.380535657 +0200 @@ -0,0 +1,622 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -35618,7 +35714,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.1. +#endif /* CONFIG_MACH_IPMATE */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-05-02 00:07:04.811246037 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-05-09 22:40:53.381535680 +0200 @@ -0,0 +1,26 @@ +/* + * dwc_modpow.h @@ -35648,7 +35744,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.1. +#endif /* _LINUX_BIGNUM_H */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-05-02 00:07:04.812246057 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-05-09 22:40:53.381535680 +0200 @@ -0,0 +1,256 @@ +#include "dwc_notifier.h" +#include "dwc_list.h" @@ -35908,7 +36004,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-05-02 00:07:04.812246057 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-05-09 22:40:53.381535680 +0200 @@ -0,0 +1,112 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -36024,7 +36120,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3. +#endif /* __DWC_NOTIFIER_H__ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-05-02 00:07:05.399257870 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-05-09 22:40:54.825564963 +0200 @@ -0,0 +1,925 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_os.h $ @@ -36953,7 +37049,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1.10.p + */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile --- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile 2012-05-02 00:07:05.398257850 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile 2012-05-09 22:40:54.824564943 +0200 @@ -0,0 +1,46 @@ +# +# Makefile for DWC_common library @@ -37003,7 +37099,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile linux-3.1.10.p + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-05-02 00:07:04.752244850 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-05-09 22:40:53.375535562 +0200 @@ -0,0 +1,36 @@ +# +# Makefile for DWC_common library @@ -37043,7 +37139,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-3. + diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h --- linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h 2012-05-02 00:07:04.816246137 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h 2012-05-09 22:40:53.384535739 +0200 @@ -0,0 +1,850 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37897,7 +37993,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h linux-3.1.10.patc +#endif /* _USB_H_ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-05-02 00:07:04.833246479 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-05-09 22:40:53.388535818 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -39476,7 +39572,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.1.10.patc +module_exit (cleanup); diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-05-02 00:07:04.840246621 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-05-09 22:40:53.389535839 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -39622,7 +39718,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-05-02 00:07:04.843246681 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-05-09 22:40:53.392535901 +0200 @@ -0,0 +1,1316 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -40942,7 +41038,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.1.10.pat +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-05-02 00:07:04.849246804 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-05-09 22:40:53.392535901 +0200 @@ -0,0 +1,88 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -41034,7 +41130,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-05-02 00:07:04.852246862 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-05-09 22:40:53.395535962 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -42914,7 +43010,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.1.10.patc +#endif //DWC_UTE_CFI diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-05-02 00:07:04.859247004 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-05-09 22:40:53.395535962 +0200 @@ -0,0 +1,319 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -43237,7 +43333,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.1.10.patc +#endif /* (__DWC_OTG_CFI_H__) */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-05-02 00:07:04.874247306 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-05-09 22:40:53.403536123 +0200 @@ -0,0 +1,5410 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -48651,7 +48747,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.1.10.patc +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-05-02 00:07:04.881247446 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-05-09 22:40:53.407536204 +0200 @@ -0,0 +1,1143 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -49798,7 +49894,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.1.10.patc +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-05-02 00:07:04.883247486 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-05-09 22:40:53.408536225 +0200 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -50648,7 +50744,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.1.10 +} diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-05-02 00:07:04.891247647 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-05-09 22:40:53.409536246 +0200 @@ -0,0 +1,641 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -51293,7 +51389,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1.10. +#endif /* __DWC_CORE_IF_H__ */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-05-02 00:07:04.892247667 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-05-09 22:40:53.410536266 +0200 @@ -0,0 +1,113 @@ +/* ========================================================================== + * @@ -51410,7 +51506,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.1.10.patc +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-05-02 00:07:04.915248131 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-05-09 22:40:53.412536306 +0200 @@ -0,0 +1,1577 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -52991,7 +53087,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1.10.p +*/ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-05-02 00:07:04.921248251 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-05-09 22:40:53.413536327 +0200 @@ -0,0 +1,101 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -53096,7 +53192,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1.10.p +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-05-02 00:07:05.490259702 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-05-09 22:40:54.867565815 +0200 @@ -0,0 +1,3334 @@ + +/* ========================================================================== @@ -56434,7 +56530,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.1.10.patc +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-05-02 00:07:04.935248532 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-05-09 22:40:53.422536510 +0200 @@ -0,0 +1,1106 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -57544,7 +57640,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.1.10 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-05-02 00:07:04.933248492 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-05-09 22:40:54.878566039 +0200 @@ -0,0 +1,804 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -58176,7 +58272,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patc + * @return Returns the memory allocate or NULL on error. */ +static inline dwc_otg_qh_t *dwc_otg_hcd_qh_alloc(void) +{ -+ return (dwc_otg_qh_t *) dwc_alloc(sizeof(dwc_otg_qh_t)); ++ return (dwc_otg_qh_t *) dwc_alloc_atomic(sizeof(dwc_otg_qh_t)); +} + +extern dwc_otg_qtd_t *dwc_otg_hcd_qtd_create(dwc_otg_hcd_urb_t * urb); @@ -58188,7 +58284,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patc + * @return Returns the memory allocate or NULL on error. */ +static inline dwc_otg_qtd_t *dwc_otg_hcd_qtd_alloc(void) +{ -+ return (dwc_otg_qtd_t *) dwc_alloc(sizeof(dwc_otg_qtd_t)); ++ return (dwc_otg_qtd_t *) dwc_alloc_atomic(sizeof(dwc_otg_qtd_t)); +} + +/** Frees the memory for a QTD structure. QTD should already be removed from @@ -58352,7 +58448,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patc +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-05-02 00:07:04.936248552 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-05-09 22:40:53.423536530 +0200 @@ -0,0 +1,393 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -58749,7 +58845,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1.10.p +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-05-02 00:07:04.939248612 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-05-09 22:40:53.426536590 +0200 @@ -0,0 +1,2065 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -60818,7 +60914,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.1.10 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-05-02 00:07:05.499259882 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-05-09 22:40:54.874565958 +0200 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $ @@ -61668,7 +61764,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.1.1 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-05-02 00:07:04.942248673 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-05-09 22:40:53.429536650 +0200 @@ -0,0 +1,732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -62404,7 +62500,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.1.1 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-05-02 00:07:04.944248713 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-05-09 22:40:53.432536711 +0200 @@ -0,0 +1,2067 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -64475,7 +64571,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.1.10.patc +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-05-02 00:07:04.945248733 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-05-09 22:40:53.433536732 +0200 @@ -0,0 +1,216 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -64695,7 +64791,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.1.10.patc +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-05-02 00:07:04.946248753 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-05-09 22:40:53.433536732 +0200 @@ -0,0 +1,333 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -65032,7 +65128,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1.10.p +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-05-02 00:07:04.971249256 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-05-09 22:40:53.439536854 +0200 @@ -0,0 +1,4077 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -69113,7 +69209,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.1.10 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-05-02 00:07:04.980249439 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-05-09 22:40:53.441536894 +0200 @@ -0,0 +1,1288 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -70405,7 +70501,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.1.1 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-05-02 00:07:04.984249519 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-05-09 22:40:53.443536934 +0200 @@ -0,0 +1,2237 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -72646,7 +72742,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.1.10.pat +#endif diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile --- linux-3.1.10/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile 2012-05-02 00:07:05.399257870 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile 2012-05-09 22:40:54.825564963 +0200 @@ -0,0 +1,80 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -72730,7 +72826,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/Makefile linux-3.1.10.patch/dri +endif diff -Naur linux-3.1.10/drivers/usb/host/Kconfig linux-3.1.10.patch/drivers/usb/host/Kconfig --- linux-3.1.10/drivers/usb/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/Kconfig 2012-05-02 00:07:04.743244668 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/Kconfig 2012-05-09 22:40:53.078529533 +0200 @@ -543,6 +543,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -72753,7 +72849,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/Kconfig linux-3.1.10.patch/drivers/usb/ depends on USB && ARM && MACH_MX21 diff -Naur linux-3.1.10/drivers/usb/host/Makefile linux-3.1.10.patch/drivers/usb/host/Makefile --- linux-3.1.10/drivers/usb/host/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/host/Makefile 2012-05-02 00:07:04.751244830 +0200 ++++ linux-3.1.10.patch/drivers/usb/host/Makefile 2012-05-09 22:40:53.225532512 +0200 @@ -32,6 +32,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -72765,7 +72861,7 @@ diff -Naur linux-3.1.10/drivers/usb/host/Makefile linux-3.1.10.patch/drivers/usb obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o diff -Naur linux-3.1.10/drivers/usb/Makefile linux-3.1.10.patch/drivers/usb/Makefile --- linux-3.1.10/drivers/usb/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/usb/Makefile 2012-05-02 00:07:04.667243140 +0200 ++++ linux-3.1.10.patch/drivers/usb/Makefile 2012-05-09 22:40:47.711420681 +0200 @@ -21,6 +21,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -72776,8 +72872,8 @@ diff -Naur linux-3.1.10/drivers/usb/Makefile linux-3.1.10.patch/drivers/usb/Make diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/video/bcm2708_fb.c --- linux-3.1.10/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/bcm2708_fb.c 2012-05-02 00:07:05.474259379 +0200 -@@ -0,0 +1,461 @@ ++++ linux-3.1.10.patch/drivers/video/bcm2708_fb.c 2012-05-09 22:40:54.882566120 +0200 +@@ -0,0 +1,475 @@ +/* + * linux/drivers/video/bcm2708_fb.c + * @@ -72807,6 +72903,7 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi +#include +#include +#include ++#include + +#include +#include @@ -72893,7 +72990,12 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + * encoded in the pixel data. Calculate their position from + * the bitfield length defined above. + */ -+ if (ret == 0 && var->bits_per_pixel >= 16) { ++ if (ret == 0 && var->bits_per_pixel >= 24) { ++ var->red.offset = 0; ++ var->green.offset = var->red.offset + var->red.length; ++ var->blue.offset = var->green.offset + var->green.length; ++ var->transp.offset = var->blue.offset + var->blue.length; ++ } else if (ret == 0 && var->bits_per_pixel >= 16) { + var->blue.offset = 0; + var->green.offset = var->blue.offset + var->blue.length; + var->red.offset = var->green.offset + var->green.length; @@ -73018,8 +73120,13 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + iounmap(fb->fb.screen_base); + fb->fb.screen_base = + (void *)ioremap_wc(fb->fb.fix.smem_start, fb->fb.screen_size); -+ if (!fb->fb.screen_base) ++ if (!fb->fb.screen_base) { ++ /* the console may currently be locked */ ++ console_trylock(); ++ console_unlock(); ++ + BUG(); /* what can we do here */ ++ } + } + pr_info + ("BCM2708FB: start = %p,%p width=%d, height=%d, bpp=%d, pitch=%d size=%d success=%d\n", @@ -73092,6 +73199,7 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + +static int fbwidth = 800; /* module parameter */ +static int fbheight = 480; /* module parameter */ ++static int fbdepth = 16; /* module parameter */ + +static int bcm2708_fb_register(struct bcm2708_fb *fb) +{ @@ -73126,7 +73234,7 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + fb->fb.var.yres = fbheight; + fb->fb.var.xres_virtual = fbwidth; + fb->fb.var.yres_virtual = fbheight; -+ fb->fb.var.bits_per_pixel = 16; ++ fb->fb.var.bits_per_pixel = fbdepth; + fb->fb.var.vmode = FB_VMODE_NONINTERLACED; + fb->fb.var.activate = FB_ACTIVATE_NOW; + fb->fb.var.nonstd = 0; @@ -73149,8 +73257,8 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + + fb_set_var(&fb->fb, &fb->fb.var); + -+ pr_info("BCM2708FB: registering framebuffer (%d, %d)\n", fbwidth, -+ fbheight); ++ pr_info("BCM2708FB: registering framebuffer (%dx%d@%d)\n", fbwidth, ++ fbheight, fbdepth); + + ret = register_framebuffer(&fb->fb); + pr_info("BCM2708FB: register framebuffer (%d)\n", ret); @@ -73233,15 +73341,17 @@ diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/vi + +module_param(fbwidth, int, 0644); +module_param(fbheight, int, 0644); ++module_param(fbdepth, int, 0644); + +MODULE_DESCRIPTION("BCM2708 framebuffer driver"); +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer"); +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); ++MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); diff -Naur linux-3.1.10/drivers/video/Kconfig linux-3.1.10.patch/drivers/video/Kconfig --- linux-3.1.10/drivers/video/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/Kconfig 2012-05-02 00:07:05.092251691 +0200 ++++ linux-3.1.10.patch/drivers/video/Kconfig 2012-05-09 22:40:54.569559772 +0200 @@ -303,6 +303,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -73265,7 +73375,7 @@ diff -Naur linux-3.1.10/drivers/video/Kconfig linux-3.1.10.patch/drivers/video/K depends on FB && ARM && ARM_AMBA diff -Naur linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-05-02 00:07:05.134252538 +0200 ++++ linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-05-09 22:40:54.702562470 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -75754,7 +75864,7 @@ diff -Naur linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.10.p +0 0 0 0 0 0 0 0 0 diff -Naur linux-3.1.10/drivers/video/Makefile linux-3.1.10.patch/drivers/video/Makefile --- linux-3.1.10/drivers/video/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/video/Makefile 2012-05-02 00:07:05.092251691 +0200 ++++ linux-3.1.10.patch/drivers/video/Makefile 2012-05-09 22:40:54.593560260 +0200 @@ -95,6 +95,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -75765,7 +75875,7 @@ diff -Naur linux-3.1.10/drivers/video/Makefile linux-3.1.10.patch/drivers/video/ obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o diff -Naur linux-3.1.10/drivers/watchdog/bcm2708_wdog.c linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c --- linux-3.1.10/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c 2012-05-02 00:07:05.090251651 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c 2012-05-09 22:40:54.525558878 +0200 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -76154,7 +76264,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/bcm2708_wdog.c linux-3.1.10.patch/drive + diff -Naur linux-3.1.10/drivers/watchdog/Kconfig linux-3.1.10.patch/drivers/watchdog/Kconfig --- linux-3.1.10/drivers/watchdog/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/Kconfig 2012-05-02 00:07:05.089251631 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/Kconfig 2012-05-09 22:40:54.488558133 +0200 @@ -348,6 +348,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -76170,7 +76280,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/Kconfig linux-3.1.10.patch/drivers/watc config AT32AP700X_WDT diff -Naur linux-3.1.10/drivers/watchdog/Makefile linux-3.1.10.patch/drivers/watchdog/Makefile --- linux-3.1.10/drivers/watchdog/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/drivers/watchdog/Makefile 2012-05-02 00:07:05.089251631 +0200 ++++ linux-3.1.10.patch/drivers/watchdog/Makefile 2012-05-09 22:40:54.525558878 +0200 @@ -54,6 +54,7 @@ obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -76181,7 +76291,7 @@ diff -Naur linux-3.1.10/drivers/watchdog/Makefile linux-3.1.10.patch/drivers/wat obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff -Naur linux-3.1.10/include/linux/mmc/host.h linux-3.1.10.patch/include/linux/mmc/host.h --- linux-3.1.10/include/linux/mmc/host.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/include/linux/mmc/host.h 2012-05-02 00:07:05.087251591 +0200 ++++ linux-3.1.10.patch/include/linux/mmc/host.h 2012-05-09 22:40:53.566539429 +0200 @@ -12,6 +12,7 @@ #include @@ -76262,7 +76372,7 @@ diff -Naur linux-3.1.10/include/linux/mmc/host.h linux-3.1.10.patch/include/linu #endif /* LINUX_MMC_HOST_H */ diff -Naur linux-3.1.10/include/linux/mmc/sdhci.h linux-3.1.10.patch/include/linux/mmc/sdhci.h --- linux-3.1.10/include/linux/mmc/sdhci.h 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/include/linux/mmc/sdhci.h 2012-05-02 00:07:05.088251611 +0200 ++++ linux-3.1.10.patch/include/linux/mmc/sdhci.h 2012-05-09 22:40:53.580539714 +0200 @@ -88,6 +88,10 @@ /* The read-only detection via SDHCI_PRESENT_STATE register is unstable */ #define SDHCI_QUIRK_UNSTABLE_RO_DETECT (1<<31) @@ -76298,7 +76408,7 @@ diff -Naur linux-3.1.10/include/linux/mmc/sdhci.h linux-3.1.10.patch/include/lin diff -Naur linux-3.1.10/sound/arm/bcm2835.c linux-3.1.10.patch/sound/arm/bcm2835.c --- linux-3.1.10/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835.c 2012-05-02 00:07:05.470259299 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835.c 2012-05-09 22:40:54.858565634 +0200 @@ -0,0 +1,423 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -76725,7 +76835,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835.c linux-3.1.10.patch/sound/arm/bcm2835 +MODULE_ALIAS("platform:bcm2835_alsa"); diff -Naur linux-3.1.10/sound/arm/bcm2835-ctl.c linux-3.1.10.patch/sound/arm/bcm2835-ctl.c --- linux-3.1.10/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-ctl.c 2012-05-02 00:07:05.465259199 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-ctl.c 2012-05-09 22:40:54.854565553 +0200 @@ -0,0 +1,172 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -76901,7 +77011,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-ctl.c linux-3.1.10.patch/sound/arm/bcm +} diff -Naur linux-3.1.10/sound/arm/bcm2835.h linux-3.1.10.patch/sound/arm/bcm2835.h --- linux-3.1.10/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835.h 2012-05-02 00:07:05.473259359 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835.h 2012-05-09 22:40:54.862565714 +0200 @@ -0,0 +1,242 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -77147,7 +77257,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835.h linux-3.1.10.patch/sound/arm/bcm2835 +#endif /* __SOUND_ARM_BCM2835_H */ diff -Naur linux-3.1.10/sound/arm/bcm2835-pcm.c linux-3.1.10.patch/sound/arm/bcm2835-pcm.c --- linux-3.1.10/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-pcm.c 2012-05-02 00:07:05.472259339 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-pcm.c 2012-05-09 22:40:54.861565694 +0200 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -77575,7 +77685,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-pcm.c linux-3.1.10.patch/sound/arm/bcm +} diff -Naur linux-3.1.10/sound/arm/bcm2835-vchiq.c linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c --- linux-3.1.10/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c 2012-05-02 00:07:05.481259520 +0200 ++++ linux-3.1.10.patch/sound/arm/bcm2835-vchiq.c 2012-05-09 22:40:54.865565774 +0200 @@ -0,0 +1,818 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -78397,7 +78507,7 @@ diff -Naur linux-3.1.10/sound/arm/bcm2835-vchiq.c linux-3.1.10.patch/sound/arm/b +} diff -Naur linux-3.1.10/sound/arm/Kconfig linux-3.1.10.patch/sound/arm/Kconfig --- linux-3.1.10/sound/arm/Kconfig 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/Kconfig 2012-05-02 00:07:05.450258897 +0200 ++++ linux-3.1.10.patch/sound/arm/Kconfig 2012-05-09 22:40:54.846565390 +0200 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -78413,7 +78523,7 @@ diff -Naur linux-3.1.10/sound/arm/Kconfig linux-3.1.10.patch/sound/arm/Kconfig diff -Naur linux-3.1.10/sound/arm/Makefile linux-3.1.10.patch/sound/arm/Makefile --- linux-3.1.10/sound/arm/Makefile 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/Makefile 2012-05-02 00:07:05.450258897 +0200 ++++ linux-3.1.10.patch/sound/arm/Makefile 2012-05-09 22:40:54.847565410 +0200 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -78426,7 +78536,7 @@ diff -Naur linux-3.1.10/sound/arm/Makefile linux-3.1.10.patch/sound/arm/Makefile + diff -Naur linux-3.1.10/sound/arm/vc_vchi_audioserv_defs.h linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.1.10/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-05-02 00:07:05.471259319 +0200 ++++ linux-3.1.10.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-05-09 22:40:54.860565674 +0200 @@ -0,0 +1,112 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. diff --git a/packages/linux/patches/linux-3.1.10-602-framebuffer.patch b/packages/linux/patches/linux-3.1.10-602-framebuffer.patch deleted file mode 100644 index 57b797672c..0000000000 --- a/packages/linux/patches/linux-3.1.10-602-framebuffer.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 42119badef15de0033da6452c0d0a2eb95a59b40 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 2 May 2012 22:13:14 +0100 -Subject: [PATCH] Swap Red and Blue over in 32bpp framebuffer mode - ---- - drivers/video/bcm2708_fb.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c -index 5b27287..ff1fffc 100644 ---- a/drivers/video/bcm2708_fb.c -+++ b/drivers/video/bcm2708_fb.c -@@ -113,7 +113,12 @@ static int bcm2708_fb_set_bitfields(struct fb_var_screeninfo *var) - * encoded in the pixel data. Calculate their position from - * the bitfield length defined above. - */ -- if (ret == 0 && var->bits_per_pixel >= 16) { -+ if (ret == 0 && var->bits_per_pixel >= 24) { -+ var->red.offset = 0; -+ var->green.offset = var->red.offset + var->red.length; -+ var->blue.offset = var->green.offset + var->green.length; -+ var->transp.offset = var->blue.offset + var->blue.length; -+ } else if (ret == 0 && var->bits_per_pixel >= 16) { - var->blue.offset = 0; - var->green.offset = var->blue.offset + var->blue.length; - var->red.offset = var->green.offset + var->green.length; -@@ -312,6 +317,7 @@ static void bcm2708_fb_imageblit(struct fb_info *info, - - static int fbwidth = 800; /* module parameter */ - static int fbheight = 480; /* module parameter */ -+static int fbdepth = 16; /* module parameter */ - - static int bcm2708_fb_register(struct bcm2708_fb *fb) - { -@@ -346,7 +352,7 @@ static int bcm2708_fb_register(struct bcm2708_fb *fb) - fb->fb.var.yres = fbheight; - fb->fb.var.xres_virtual = fbwidth; - fb->fb.var.yres_virtual = fbheight; -- fb->fb.var.bits_per_pixel = 16; -+ fb->fb.var.bits_per_pixel = fbdepth; - fb->fb.var.vmode = FB_VMODE_NONINTERLACED; - fb->fb.var.activate = FB_ACTIVATE_NOW; - fb->fb.var.nonstd = 0; -@@ -369,8 +375,8 @@ static int bcm2708_fb_register(struct bcm2708_fb *fb) - - fb_set_var(&fb->fb, &fb->fb.var); - -- pr_info("BCM2708FB: registering framebuffer (%d, %d)\n", fbwidth, -- fbheight); -+ pr_info("BCM2708FB: registering framebuffer (%dx%d@%d)\n", fbwidth, -+ fbheight, fbdepth); - - ret = register_framebuffer(&fb->fb); - pr_info("BCM2708FB: register framebuffer (%d)\n", ret); -@@ -453,9 +459,11 @@ static void __exit bcm2708_fb_exit(void) - - module_param(fbwidth, int, 0644); - module_param(fbheight, int, 0644); -+module_param(fbdepth, int, 0644); - - MODULE_DESCRIPTION("BCM2708 framebuffer driver"); - MODULE_LICENSE("GPL"); - - MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer"); - MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); -+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); --- -1.7.10 -