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/300-cbus-platform.patch | |
parent | e184bfe6f044b886297ef7b7133079cafcb7d5af (diff) | |
download | master-31e0f0ae-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.gz master-31e0f0ae-ba9ee13744548909b767ab4dcc71dc0eb00433b7.tar.bz2 master-31e0f0ae-ba9ee13744548909b767ab4dcc71dc0eb00433b7.zip |
omap24xx: Refresh 3.1 patches
SVN-Revision: 28676
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.patch | 12 |
1 files changed, 6 insertions, 6 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 567e4c6f19..7049b4d486 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,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:03.620973158 +0200 -+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c 2011-10-29 20:35:48.268866718 +0200 +--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:29.505056863 +0200 ++++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:47.357044479 +0200 @@ -15,8 +15,10 @@ #include <linux/delay.h> #include <linux/gpio.h> @@ -145,10 +145,10 @@ Index: linux-3.1-rc4/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-rc4/arch/arm/plat-omap/include/plat/irqs.h +Index: linux-3.1/arch/arm/plat-omap/include/plat/irqs.h =================================================================== ---- linux-3.1-rc4.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-10-29 20:35:01.620977933 +0200 -+++ linux-3.1-rc4/arch/arm/plat-omap/include/plat/irqs.h 2011-10-29 20:35:48.268866718 +0200 +--- linux-3.1.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:29.517056855 +0200 ++++ linux-3.1/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:47.357044479 +0200 @@ -428,8 +428,16 @@ #define OMAP_GPMC_NR_IRQS 8 #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS) |