diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
| commit | d8acb75009ad7f674609664810fef3a11d72205e (patch) | |
| tree | d66c7e0323af53562e5f0e4e0fd7d9ab49d3ca7a /target/linux/omap24xx/patches-3.1/300-cbus-platform.patch | |
| parent | a8797d0de6fac61582e9e9212e55e0bc1449f4b1 (diff) | |
| download | upstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.gz upstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.bz2 upstream-d8acb75009ad7f674609664810fef3a11d72205e.zip | |
linux: update 3.1 to 3.1.1
SVN-Revision: 29007
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, 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 |