[x86] Allow gzipping of squashfs images with padded jffs2 partition

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 330-n800-tsc2301-platform.patch

diff --git a/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch b/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
index bb95774..553a791 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
@@ -8,11 +8,9 @@ This patch adds TSC2301 init logic to N800 board file
  arch/arm/mach-omap2/board-n8x0.c |  141 ++++++++++++++++++++++++++++++++++++--
  1 files changed, 135 insertions(+), 6 deletions(-)
 
-Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c
-===================================================================
---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c        2011-10-29 22:14:18.752777837 +0200
-+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c     2011-10-29 22:16:59.040112725 +0200
-@@ -26,6 +26,7 @@
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
+@@ -27,6 +27,7 @@
  #include <linux/spi/tsc2005.h>
  #include <linux/input.h>
  #include <linux/i2c/lm8323.h>
@@ -182,7 +180,7 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c
  };
  
  #if defined(CONFIG_MTD_ONENAND_OMAP2) || \
-@@ -1027,9 +1144,17 @@ static void __init n8x0_init_machine(voi
+@@ -1023,9 +1140,17 @@ static void __init n8x0_init_machine(voi
        n8x0_bt_init();
  
        /* FIXME: add n810 spi devices */
@@ -203,7 +201,7 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c
        omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
                              ARRAY_SIZE(n8x0_i2c_board_info_1));
        omap_register_i2c_bus(2, 400, NULL, 0);
-@@ -1039,6 +1164,8 @@ static void __init n8x0_init_machine(voi
+@@ -1035,6 +1160,8 @@ static void __init n8x0_init_machine(voi
        board_serial_init();
        n8x0_mipid_init();
        n8x0_blizzard_init();