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

Top Page
This message is part of the following thread:
Mthe complete thread tree sorted by date
 
 
Attachments:
Message as email
+ (text/plain)
Delete this message
Reply to this message
Author: subversion@balloonboard.org
Date:  
To: balloon-svn
Subject: [Balloon-svn] r1866 - balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4
Author: nick
Date: 2012-05-01 17:47:26 +0100 (Tue, 01 May 2012)
New Revision: 1866

Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/usb_gadget_vbus.patch
Log:
no functional changes, just patch offsets due to other patches 

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-05-01 16:46:24 UTC (rev 1865)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/spi_tt.patch    2012-05-01 16:47:26 UTC (rev 1866)
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/drivers/spi/Kconfig
 ===================================================================
---- linux-2.6.39.4.orig/drivers/spi/Kconfig    2012-04-27 11:32:59.000000000 +0100
-+++ linux-2.6.39.4/drivers/spi/Kconfig    2012-04-27 11:37:59.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/spi/Kconfig    2012-05-01 17:30:37.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/Kconfig    2012-05-01 17:31:58.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-04-27 11:32:59.000000000 +0100
-+++ linux-2.6.39.4/drivers/spi/Makefile    2012-04-27 11:37:59.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/spi/Makefile    2012-05-01 17:30:37.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/Makefile    2012-05-01 17:31:58.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-04-27 11:35:09.000000000 +0100
++++ linux-2.6.39.4/drivers/spi/spi_tt.c    2012-05-01 17:31:58.000000000 +0100
 @@ -0,0 +1,291 @@
 +/*
 + * Copyright 20011 Toby Churchill Ltd
@@ -335,7 +335,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-04-27 11:35:25.000000000 +0100
++++ linux-2.6.39.4/include/linux/spi/spi_tt.h    2012-05-01 17:31:58.000000000 +0100
 @@ -0,0 +1,65 @@
 +#ifndef SPI_TT_H
 +#define SPI_TT_H
@@ -404,8 +404,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-04-27 11:37:58.000000000 +0100
-+++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-04-27 11:37:59.000000000 +0100
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c    2012-05-01 17:31:58.000000000 +0100
++++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c    2012-05-01 17:31:58.000000000 +0100
 @@ -54,6 +54,12 @@
  #include <mach/irda.h>
  #include <mach/ohci.h>
@@ -419,7 +419,7 @@
  #include <sound/wm8960.h>


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


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


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


-@@ -681,31 +707,55 @@
+@@ -685,31 +711,55 @@
  /******************************************************************************
   * FPGA IRQ
   ******************************************************************************/
@@ -511,7 +511,7 @@
      do {
          /* clear useless edge notification */
          if (desc->irq_data.chip->irq_ack) {
-@@ -720,9 +770,23 @@
+@@ -724,9 +774,23 @@
              generic_handle_irq(irq);
              pending &= pending - 1;
          }
@@ -535,7 +535,7 @@
  }


static void __init balloon3_init_irq(void)
-@@ -742,6 +806,13 @@
+@@ -746,6 +810,13 @@ 

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


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

@@ -610,7 +610,7 @@

//#define PAC_REG_POWERCONTROL __REG(0x4050024c) 

-@@ -1156,6 +1281,7 @@
+@@ -1173,6 +1298,7 @@
      balloon3_uhc_init();
      balloon3_cf_init();
      balloon3_power_fault_init();


Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/usb_gadget_vbus.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/usb_gadget_vbus.patch    2012-05-01 16:46:24 UTC (rev 1865)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/usb_gadget_vbus.patch    2012-05-01 16:47:26 UTC (rev 1866)
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/drivers/usb/gadget/composite.c
 ===================================================================
---- linux-2.6.39.4.orig/drivers/usb/gadget/composite.c    2012-04-16 16:12:16.000000000 +0100
-+++ linux-2.6.39.4/drivers/usb/gadget/composite.c    2012-04-17 13:03:49.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/usb/gadget/composite.c    2012-05-01 13:59:14.000000000 +0100
++++ linux-2.6.39.4/drivers/usb/gadget/composite.c    2012-05-01 14:02:26.000000000 +0100
 @@ -71,6 +71,10 @@
  module_param(iSerialNumber, charp, 0);
  MODULE_PARM_DESC(iSerialNumber, "SerialNumber string");
@@ -51,8 +51,8 @@
      cdev->suspended = 0;
 Index: linux-2.6.39.4/drivers/usb/gadget/pxa27x_udc.c
 ===================================================================
---- linux-2.6.39.4.orig/drivers/usb/gadget/pxa27x_udc.c    2012-04-17 10:27:14.000000000 +0100
-+++ linux-2.6.39.4/drivers/usb/gadget/pxa27x_udc.c    2012-04-17 10:35:27.000000000 +0100
+--- linux-2.6.39.4.orig/drivers/usb/gadget/pxa27x_udc.c    2012-05-01 14:02:26.000000000 +0100
++++ linux-2.6.39.4/drivers/usb/gadget/pxa27x_udc.c    2012-05-01 14:02:26.000000000 +0100
 @@ -42,7 +42,10 @@
  #include <mach/udc.h>


@@ -65,7 +65,7 @@
  /*
   * This driver handles the USB Device Controller (UDC) in Intel's PXA 27x
   * series processors.
-@@ -1691,6 +1694,10 @@
+@@ -1695,6 +1698,10 @@
      struct pxa_udc *udc;


      udc = to_gadget_udc(_gadget);



This message was posted to the following mailing lists:
Balloon-svn
Mailing List Info | Nearby Messages		<-[Balloon-svn] r1865 - balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4[Balloon-svn] r1867 - balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4->
Stoneboat Mailing List Archive administrated by JennyLurker (version 2.3)