aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/310-n810-lcd.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/310-n810-lcd.patch
parentb94c5c50310b7e0fa870a52cc9ade8a3220adf59 (diff)
downloadmaster-187ad058-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.gz
master-187ad058-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.bz2
master-187ad058-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/310-n810-lcd.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/310-n810-lcd.patch18
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch b/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
index 5ac1360e0b..4c630e148a 100644
--- a/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
+++ b/target/linux/omap24xx/patches-3.1/310-n810-lcd.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:14:31.600257909 +0100
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:14:46.712140689 +0100
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -24,6 +24,7 @@
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
@@ -124,10 +122,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
gpmc_onenand_init(board_onenand_data);
n8x0_mmc_init();
n8x0_usb_init();
-Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 21:14:46.712140689 +0100
+--- /dev/null
++++ b/arch/arm/mach-omap2/board-n8x0-lcd.c
@@ -0,0 +1,231 @@
+/*
+ * linux/arch/arm/mach-omap2/board-n8x0.c
@@ -360,10 +356,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
+
+ printk(KERN_INFO "N8x0 Blizzard initialized");
+}
-Index: linux-3.1/arch/arm/mach-omap2/Makefile
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/Makefile 2011-10-30 21:14:31.608257847 +0100
-+++ linux-3.1/arch/arm/mach-omap2/Makefile 2011-10-30 21:14:46.712140689 +0100
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
@@ -209,6 +209,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar
hsmmc.o \
board-flash.o