From 85ec5ce98d8ba7e2ad3a877230b5f7e1b280d4c5 Mon Sep 17 00:00:00 2001 From: jogo Date: Sun, 13 Nov 2011 10:48:05 +0000 Subject: linux: update 3.1 to 3.1.1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/omap24xx/patches-3.1/300-cbus-platform.patch | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'target/linux/omap24xx/patches-3.1/300-cbus-platform.patch') diff --git a/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch b/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch index abc724359..a5783754b 100644 --- a/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch +++ b/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch @@ -1,7 +1,5 @@ -Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c -=================================================================== ---- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:04:56.008818251 +0100 -+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:14:31.600257909 +0100 +--- a/arch/arm/mach-omap2/board-n8x0.c ++++ b/arch/arm/mach-omap2/board-n8x0.c @@ -15,8 +15,11 @@ #include #include @@ -134,10 +132,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c /* FIXME: add n810 spi devices */ spi_register_board_info(n800_spi_board_info, ARRAY_SIZE(n800_spi_board_info)); -Index: linux-3.1/include/linux/platform_data/cbus.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1/include/linux/platform_data/cbus.h 2011-10-30 21:05:07.540709042 +0100 +--- /dev/null ++++ b/include/linux/platform_data/cbus.h @@ -0,0 +1,38 @@ +/* + * cbus.h - CBUS platform_data definition -- cgit v1.2.3