aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
commite30803b3df8914dbd3864d0ba3dfc1e02dfa8524 (patch)
treeaa5d6eb24cbb7886936f09c1f3d28f7979c05ea4 /target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
parentb94c5c50310b7e0fa870a52cc9ade8a3220adf59 (diff)
downloadupstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.gz
upstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.bz2
upstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.zip
linux: update 3.1 to 3.1.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/300-cbus-platform.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/300-cbus-platform.patch12
1 files changed, 4 insertions, 8 deletions
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 abc724359a..a5783754b6 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 <linux/delay.h>
#include <linux/gpio.h>
@@ -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