diff options
| author | Michael Büsch <mb@bu3sch.de> | 2011-10-29 22:52:07 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2011-10-29 22:52:07 +0000 |
| commit | ba9ee13744548909b767ab4dcc71dc0eb00433b7 (patch) | |
| tree | 471dfd149ad0b82f14ca849f9ad0214b4a0dcbf8 /target/linux/omap24xx/patches-3.1/320-nokia-various.patch | |
| parent | e184bfe6f044b886297ef7b7133079cafcb7d5af (diff) | |
| download | upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.gz upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.bz2 upstream-ba9ee13744548909b767ab4dcc71dc0eb00433b7.zip | |
omap24xx: Refresh 3.1 patches
SVN-Revision: 28676
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/320-nokia-various.patch')
| -rw-r--r-- | target/linux/omap24xx/patches-3.1/320-nokia-various.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/omap24xx/patches-3.1/320-nokia-various.patch b/target/linux/omap24xx/patches-3.1/320-nokia-various.patch index 7a73d34925..5f1d06304c 100644 --- a/target/linux/omap24xx/patches-3.1/320-nokia-various.patch +++ b/target/linux/omap24xx/patches-3.1/320-nokia-various.patch @@ -1,7 +1,7 @@ -Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c +Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c =================================================================== ---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:57.228845384 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:58.476842416 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:48.205044041 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:49.837042881 +0200 @@ -24,6 +24,8 @@ #include <linux/usb/musb.h> #include <sound/tlv320aic3x.h> @@ -194,10 +194,10 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c /* FIXME: add n810 spi devices */ tsc2005_set_config(); -Index: linux-3.1-rc4/arch/arm/plat-omap/include/plat/cbus.h +Index: linux-3.1/arch/arm/plat-omap/include/plat/cbus.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1-rc4/arch/arm/plat-omap/include/plat/cbus.h 2011-10-29 20:35:58.476842416 +0200 ++++ linux-3.1/arch/arm/plat-omap/include/plat/cbus.h 2011-10-30 00:48:49.837042881 +0200 @@ -0,0 +1,40 @@ +/* + * cbus.h - CBUS platform_data definition |