[Balloon-svn] r1889 - balloon/branches/menuconfig2/package/k…

Author: nick
Date: 2012-06-01 13:21:48 +0100 (Fri, 01 Jun 2012)
New Revision: 1889

Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch
Log:
update patch offsets to remove patch noise

Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch    2012-06-01 12:21:09 UTC (rev 1888)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch    2012-06-01 12:21:48 UTC (rev 1889)
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/drivers/spi/Kconfig
 ===================================================================
---- linux-2.6.39.4.orig/drivers/spi/Kconfig    2012-05-31 13:18:34.000000000 +0100
-+++ linux-2.6.39.4/drivers/spi/Kconfig    2012-05-31 13:18:55.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/spi/Kconfig    2012-06-01 13:17:47.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/Kconfig    2012-06-01 13:18:00.000000000 +0100
 @@ -386,6 +386,21 @@
        SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
        used in some x86 embedded processors.
@@ -26,8 +26,8 @@
      depends on GENERIC_GPIO && CPU_TX49XX
 Index: linux-2.6.39.4/drivers/spi/Makefile
 ===================================================================
---- linux-2.6.39.4.orig/drivers/spi/Makefile    2012-05-31 13:18:34.000000000 +0100
-+++ linux-2.6.39.4/drivers/spi/Makefile    2012-05-31 13:18:55.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/spi/Makefile    2012-06-01 13:17:47.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/Makefile    2012-06-01 13:18:00.000000000 +0100
 @@ -54,6 +54,7 @@
  obj-$(CONFIG_SPI_SH_MSIOF)        += spi_sh_msiof.o
  obj-$(CONFIG_SPI_STMP3XXX)        += spi_stmp.o
@@ -39,7 +39,7 @@
 Index: linux-2.6.39.4/drivers/spi/spi_tt.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/spi/spi_tt.c    2012-05-31 13:18:55.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/spi_tt.c    2012-06-01 13:18:00.000000000 +0100
 @@ -0,0 +1,293 @@
 +/*
 + * Copyright 20011 Toby Churchill Ltd
@@ -337,7 +337,7 @@
 Index: linux-2.6.39.4/include/linux/spi/spi_tt.h
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/include/linux/spi/spi_tt.h    2012-05-31 13:18:55.000000000 +0100
++++ linux-2.6.39.4/include/linux/spi/spi_tt.h    2012-06-01 13:18:00.000000000 +0100
 @@ -0,0 +1,69 @@
 +#ifndef SPI_TT_H
 +#define SPI_TT_H
@@ -410,8 +410,8 @@
 +#endif
 Index: linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c
 ===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c    2012-05-31 13:18:55.000000000 +0100
-+++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-05-31 13:18:55.000000000 +0100
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c    2012-06-01 13:18:00.000000000 +0100
++++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-06-01 13:18:00.000000000 +0100
 @@ -54,6 +54,12 @@
  #include <mach/irda.h>
  #include <mach/ohci.h>
@@ -425,7 +425,7 @@
  #include <sound/wm8960.h>

  #include "generic.h"
-@@ -315,6 +321,9 @@
+@@ -322,6 +328,9 @@
  static void balloon3_backlight_power(int on)
  {
      gpio_set_value(BALLOON3_GPIO_RUN_BACKLIGHT, on);
@@ -435,7 +435,7 @@
  }

  static char *lcd;
-@@ -400,7 +409,24 @@
+@@ -407,7 +416,24 @@
          goto err2;
      }

@@ -460,7 +460,7 @@
      pxa_set_fb_info(NULL, &balloon3_lcd_screen);
      return;

-@@ -685,31 +711,55 @@
+@@ -692,31 +718,55 @@
  /******************************************************************************
   * FPGA IRQ
   ******************************************************************************/
@@ -517,7 +517,7 @@
      do {
          /* clear useless edge notification */
          if (desc->irq_data.chip->irq_ack) {
-@@ -724,9 +774,23 @@
+@@ -731,9 +781,23 @@
              generic_handle_irq(irq);
              pending &= pending - 1;
          }
@@ -541,7 +541,7 @@
  }

static void __init balloon3_init_irq(void)
-@@ -746,6 +810,13 @@
+@@ -753,6 +817,13 @@

      pr_debug("%s: chained handler installed - irq %d automatically "
          "enabled\n", __func__, BALLOON3_AUX_NIRQ);
@@ -555,7 +555,7 @@
  }

/******************************************************************************
-@@ -999,6 +1070,60 @@
+@@ -1006,6 +1077,60 @@
static inline void balloon3_pmic_init(void) {}
#endif

@@ -616,7 +616,7 @@

//#define PAC_REG_POWERCONTROL __REG(0x4050024c)

-@@ -1070,6 +1195,19 @@
+@@ -1077,6 +1202,19 @@

      /* switch off RS232 */
      gpio_set_value(BALLOON3_GPIO_RUN_232, 0);
@@ -636,7 +636,7 @@
      asm ( "mov r0,#0x7\n"
          "mcr p14, 0, r0, c7, c0, 0\n"
      );
-@@ -1160,6 +1298,7 @@
+@@ -1167,6 +1305,7 @@
      balloon3_uhc_init();
      balloon3_cf_init();
      balloon3_power_fault_init();