[kernel] update to 2.6.25.12
authorGabor Juhos <juhosg@openwrt.org>
Sat, 26 Jul 2008 10:53:23 +0000 (10:53 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sat, 26 Jul 2008 10:53:23 +0000 (10:53 +0000)
SVN-Revision: 11933

44 files changed:
include/kernel-version.mk
target/linux/adm5120/Makefile
target/linux/ar7/Makefile
target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
target/linux/ar71xx/Makefile
target/linux/ar71xx/patches/003-ar71xx_usb_host.patch
target/linux/ar71xx/patches/900-mips_multi_machine_support.patch
target/linux/at91/Makefile
target/linux/at91/patches-2.6.25/000-at91patches.patch
target/linux/at91/patches-2.6.25/001-vlink-machine.patch
target/linux/at91/patches-2.6.25/002-led-driver.patch
target/linux/at91/patches-2.6.25/003-gpio-driver.patch
target/linux/at91/patches-2.6.25/007-mtd-partition.patch
target/linux/at91/patches-2.6.25/008-fdl-serial.patch
target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
target/linux/at91/patches-2.6.25/014-initpartition.patch
target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
target/linux/au1000/Makefile
target/linux/avr32/Makefile
target/linux/avr32/patches/100-git_sync.patch
target/linux/brcm47xx/Makefile
target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch
target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch
target/linux/brcm63xx/Makefile
target/linux/etrax/Makefile
target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch
target/linux/generic-2.6/patches-2.6.25/951-ocf-scatterlist-inc.patch
target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch
target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch
target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
target/linux/ifxmips/Makefile
target/linux/ifxmips/patches/100-board.patch
target/linux/ifxmips/patches/110-drivers.patch
target/linux/ifxmips/patches/170-dma_hack.patch
target/linux/ps3/Makefile
target/linux/x86/Makefile

index 6fa9250..d06e419 100644 (file)
@@ -25,8 +25,8 @@ endif
 ifeq ($(LINUX_VERSION),2.6.24.7)
   LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
 endif
-ifeq ($(LINUX_VERSION),2.6.25.10)
-  LINUX_KERNEL_MD5SUM:=a6b0aa5b1fa1ae5a02a7b67345f01e86
+ifeq ($(LINUX_VERSION),2.6.25.12)
+  LINUX_KERNEL_MD5SUM:=7c413ecf94a84776aaec6ada5694318c
 endif
 ifeq ($(LINUX_VERSION),2.6.26)
   LINUX_KERNEL_MD5SUM:=5169d01c405bc3f866c59338e217968c
index f96a5ce..be42321 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 BOARD:=adm5120
 BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 SUBTARGETS:=router_le router_be
 INITRAMFS_EXTRA_FILES:=
 
index 6a10405..a40dc59 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=ar7
 BOARDNAME:=TI AR7
 FEATURES:=squashfs jffs2 atm
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index a40d4a3..26b4b3e 100644 (file)
@@ -14,7 +14,7 @@
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2455,7 +2462,11 @@
+@@ -2457,7 +2464,11 @@
  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  
index 849f4c2..0aa715d 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=ar71xx
 BOARDNAME:=Atheros AR71xx
 FEATURES:=squashfs tgz broken
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index 33b2475..60c0d1e 100644 (file)
@@ -47,7 +47,7 @@
 --- a/drivers/usb/host/ohci-hcd.c
 +++ b/drivers/usb/host/ohci-hcd.c
 @@ -1057,6 +1057,11 @@
- #define PLATFORM_DRIVER               ohci_hcd_sm501_driver
+ #define SM501_OHCI_DRIVER     ohci_hcd_sm501_driver
  #endif
  
 +#ifdef CONFIG_USB_OHCI_AR71XX
index 8932ba6..1d9a601 100644 (file)
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -700,6 +700,7 @@
+@@ -701,6 +701,7 @@
  
  endchoice
  
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/basler/excite/Kconfig"
  source "arch/mips/jazz/Kconfig"
-@@ -857,6 +858,9 @@
+@@ -858,6 +859,9 @@
  config MIPS_DISABLE_OBSOLETE_IDE
        bool
  
index 53eb448..00514c7 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=at91
 BOARDNAME:=Atmel AT91
 FEATURES:=squashfs usb
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index b522a30..74962b2 100644 (file)
@@ -1,6 +1,5 @@
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Kconfig linux-2.6/arch/arm/mach-at91/Kconfig
---- linux-2.6.25/arch/arm/mach-at91/Kconfig    2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/Kconfig       2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/Kconfig
++++ b/arch/arm/mach-at91/Kconfig
 @@ -12,18 +12,28 @@
  
  config ARCH_AT91SAM9260
@@ -165,9 +164,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Kconfig linux-2.6/arch/arm/mach
  config AT91_TIMER_HZ
         int "Kernel HZ (jiffies per second)"
         range 32 1024
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Makefile linux-2.6/arch/arm/mach-at91/Makefile
---- linux-2.6.25/arch/arm/mach-at91/Makefile   2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/Makefile      2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/Makefile
++++ b/arch/arm/mach-at91/Makefile
 @@ -28,16 +28,26 @@
  obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
  obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
@@ -207,9 +205,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Makefile linux-2.6/arch/arm/mac
  
  ifeq ($(CONFIG_PM_DEBUG),y)
  CFLAGS_pm.o += -DDEBUG
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91cap9.c linux-2.6/arch/arm/mach-at91/at91cap9.c
---- linux-2.6.25/arch/arm/mach-at91/at91cap9.c 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91cap9.c    2008-05-05 22:01:39.000000000 +0200
+--- a/arch/arm/mach-at91/at91cap9.c
++++ b/arch/arm/mach-at91/at91cap9.c
 @@ -13,12 +13,15 @@
   */
  
@@ -260,9 +257,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91cap9.c linux-2.6/arch/arm/m
  }
  
  /* --------------------------------------------------------------------
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91cap9_devices.c linux-2.6/arch/arm/mach-at91/at91cap9_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91cap9_devices.c 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91cap9_devices.c    2008-05-05 22:01:39.000000000 +0200
+--- a/arch/arm/mach-at91/at91cap9_devices.c
++++ b/arch/arm/mach-at91/at91cap9_devices.c
 @@ -13,18 +13,20 @@
   */
  #include <asm/mach/arch.h>
@@ -554,9 +550,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91cap9_devices.c linux-2.6/ar
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91rm9200_devices.c       2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91rm9200_devices.c  2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91rm9200_devices.c
++++ b/arch/arm/mach-at91/at91rm9200_devices.c
 @@ -513,7 +513,18 @@
   *  SPI
   * -------------------------------------------------------------------- */
@@ -734,9 +729,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6/
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91rm9200_time.c linux-2.6/arch/arm/mach-at91/at91rm9200_time.c
---- linux-2.6.25/arch/arm/mach-at91/at91rm9200_time.c  2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91rm9200_time.c     2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91rm9200_time.c
++++ b/arch/arm/mach-at91/at91rm9200_time.c
 @@ -136,8 +136,6 @@
        u32             alm;
        int             status = 0;
@@ -746,9 +740,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91rm9200_time.c linux-2.6/arc
        /* Use "raw" primitives so we behave correctly on RT kernels. */
        raw_local_irq_save(flags);
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9260.c linux-2.6/arch/arm/mach-at91/at91sam9260.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9260.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9260.c 2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9260.c
++++ b/arch/arm/mach-at91/at91sam9260.c
 @@ -11,6 +11,7 @@
   */
  
@@ -785,9 +778,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9260.c linux-2.6/arch/ar
        at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
                        | (1 << AT91SAM9260_ID_IRQ2);
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6/arch/arm/mach-at91/at91sam9260_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9260_devices.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9260_devices.c 2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9260_devices.c
++++ b/arch/arm/mach-at91/at91sam9260_devices.c
 @@ -19,8 +19,8 @@
  #include <asm/arch/board.h>
  #include <asm/arch/gpio.h>
@@ -958,9 +950,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9261.c linux-2.6/arch/arm/mach-at91/at91sam9261.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9261.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9261.c 2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9261.c
++++ b/arch/arm/mach-at91/at91sam9261.c
 @@ -11,12 +11,14 @@
   */
  
@@ -996,9 +987,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9261.c linux-2.6/arch/ar
        at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
                        | (1 << AT91SAM9261_ID_IRQ2);
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6/arch/arm/mach-at91/at91sam9261_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9261_devices.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9261_devices.c 2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9261_devices.c
++++ b/arch/arm/mach-at91/at91sam9261_devices.c
 @@ -24,7 +24,7 @@
  #include <asm/arch/gpio.h>
  #include <asm/arch/at91sam9261.h>
@@ -1116,9 +1106,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9263.c linux-2.6/arch/arm/mach-at91/at91sam9263.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9263.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9263.c 2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9263.c
++++ b/arch/arm/mach-at91/at91sam9263.c
 @@ -11,12 +11,14 @@
   */
  
@@ -1154,9 +1143,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9263.c linux-2.6/arch/ar
        at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
  
        /* Init clock subsystem */
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6/arch/arm/mach-at91/at91sam9263_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9263_devices.c      2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9263_devices.c 2008-04-25 21:16:23.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9263_devices.c
++++ b/arch/arm/mach-at91/at91sam9263_devices.c
 @@ -22,8 +22,8 @@
  #include <asm/arch/board.h>
  #include <asm/arch/gpio.h>
@@ -1297,9 +1285,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam926x_time.c linux-2.6/arch/arm/mach-at91/at91sam926x_time.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam926x_time.c 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam926x_time.c    2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam926x_time.c
++++ b/arch/arm/mach-at91/at91sam926x_time.c
 @@ -1,23 +1,20 @@
  /*
 - * linux/arch/arm/mach-at91/at91sam926x_time.c
@@ -1534,9 +1521,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam926x_time.c linux-2.6/ar
 +      .resume         = at91sam926x_pit_reset,
  };
 -
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9rl.c linux-2.6/arch/arm/mach-at91/at91sam9rl.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9rl.c       2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9rl.c  2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9rl.c
++++ b/arch/arm/mach-at91/at91sam9rl.c
 @@ -10,6 +10,7 @@
   */
  
@@ -1573,9 +1559,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9rl.c linux-2.6/arch/arm
        at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
  
        /* Init clock subsystem */
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6/arch/arm/mach-at91/at91sam9rl_devices.c
---- linux-2.6.25/arch/arm/mach-at91/at91sam9rl_devices.c       2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/at91sam9rl_devices.c  2008-05-02 00:52:36.000000000 +0200
+--- a/arch/arm/mach-at91/at91sam9rl_devices.c
++++ b/arch/arm/mach-at91/at91sam9rl_devices.c
 @@ -20,12 +20,107 @@
  #include <asm/arch/gpio.h>
  #include <asm/arch/at91sam9rl.h>
@@ -1873,9 +1858,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6/
        return 0;
  }
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-cam60.c linux-2.6/arch/arm/mach-at91/board-cam60.c
---- linux-2.6.25/arch/arm/mach-at91/board-cam60.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-cam60.c 2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-cam60.c
 @@ -0,0 +1,180 @@
 +/*
 + * KwikByte CAM60 (KB9260)
@@ -2057,9 +2041,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-cam60.c linux-2.6/arch/ar
 +      .init_irq       = cam60_init_irq,
 +      .init_machine   = cam60_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-cap9adk.c linux-2.6/arch/arm/mach-at91/board-cap9adk.c
---- linux-2.6.25/arch/arm/mach-at91/board-cap9adk.c    2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-cap9adk.c       2008-05-05 22:01:39.000000000 +0200
+--- a/arch/arm/mach-at91/board-cap9adk.c
++++ b/arch/arm/mach-at91/board-cap9adk.c
 @@ -36,16 +36,14 @@
  #include <asm/hardware.h>
  #include <asm/setup.h>
@@ -2119,9 +2102,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-cap9adk.c linux-2.6/arch/
        at91_add_device_lcdc(&cap9adk_lcdc_data);
        /* AC97 */
        at91_add_device_ac97(&cap9adk_ac97_data);
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-carmeva.c linux-2.6/arch/arm/mach-at91/board-carmeva.c
---- linux-2.6.25/arch/arm/mach-at91/board-carmeva.c    2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-carmeva.c       2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/board-carmeva.c
++++ b/arch/arm/mach-at91/board-carmeva.c
 @@ -40,24 +40,21 @@
  #include "generic.h"
  
@@ -2197,9 +2179,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-carmeva.c linux-2.6/arch/
  }
  
  MACHINE_START(CARMEVA, "Carmeva")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-chub.c linux-2.6/arch/arm/mach-at91/board-chub.c
---- linux-2.6.25/arch/arm/mach-at91/board-chub.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-chub.c  2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-chub.c
 @@ -0,0 +1,132 @@
 +/*
 + * linux/arch/arm/mach-at91/board-chub.c
@@ -2333,9 +2314,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-chub.c linux-2.6/arch/arm
 +      .init_irq       = chub_init_irq,
 +      .init_machine   = chub_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-csb337.c linux-2.6/arch/arm/mach-at91/board-csb337.c
---- linux-2.6.25/arch/arm/mach-at91/board-csb337.c     2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-csb337.c        2008-05-02 00:05:42.000000000 +0200
+--- a/arch/arm/mach-at91/board-csb337.c
++++ b/arch/arm/mach-at91/board-csb337.c
 @@ -61,6 +61,7 @@
  
        /* Setup the LEDs */
@@ -2368,9 +2348,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-csb337.c linux-2.6/arch/a
  };
  
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-csb637.c linux-2.6/arch/arm/mach-at91/board-csb637.c
---- linux-2.6.25/arch/arm/mach-at91/board-csb637.c     2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-csb637.c        2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/board-csb637.c
++++ b/arch/arm/mach-at91/board-csb637.c
 @@ -40,27 +40,16 @@
  #include "generic.h"
  
@@ -2423,9 +2402,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-csb637.c linux-2.6/arch/a
        /* Serial */
        at91_add_device_serial();
        /* Ethernet */
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-dk.c linux-2.6/arch/arm/mach-at91/board-dk.c
---- linux-2.6.25/arch/arm/mach-at91/board-dk.c 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-dk.c    2008-05-03 00:44:06.000000000 +0200
+--- a/arch/arm/mach-at91/board-dk.c
++++ b/arch/arm/mach-at91/board-dk.c
 @@ -25,6 +25,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -2680,9 +2658,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-dk.c linux-2.6/arch/arm/m
  }
  
  MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-eb9200.c linux-2.6/arch/arm/mach-at91/board-eb9200.c
---- linux-2.6.25/arch/arm/mach-at91/board-eb9200.c     2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-eb9200.c        2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/board-eb9200.c
++++ b/arch/arm/mach-at91/board-eb9200.c
 @@ -40,24 +40,24 @@
  #include "generic.h"
  
@@ -2721,9 +2698,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-eb9200.c linux-2.6/arch/a
  }
  
  static void __init eb9200_init_irq(void)
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-ecbat91.c linux-2.6/arch/arm/mach-at91/board-ecbat91.c
---- linux-2.6.25/arch/arm/mach-at91/board-ecbat91.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-ecbat91.c       2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-ecbat91.c
 @@ -0,0 +1,178 @@
 +/*
 + * linux/arch/arm/mach-at91rm9200/board-ecbat91.c
@@ -2903,9 +2879,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-ecbat91.c linux-2.6/arch/
 +      .init_irq       = ecb_at91init_irq,
 +      .init_machine   = ecb_at91board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-ek.c linux-2.6/arch/arm/mach-at91/board-ek.c
---- linux-2.6.25/arch/arm/mach-at91/board-ek.c 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-ek.c    2008-05-03 00:44:38.000000000 +0200
+--- a/arch/arm/mach-at91/board-ek.c
++++ b/arch/arm/mach-at91/board-ek.c
 @@ -25,6 +25,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -3157,9 +3132,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-ek.c linux-2.6/arch/arm/m
  }
  
  MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-homematic.c linux-2.6/arch/arm/mach-at91/board-homematic.c
---- linux-2.6.25/arch/arm/mach-at91/board-homematic.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-homematic.c     2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-homematic.c
 @@ -0,0 +1,163 @@
 +/*
 + * linux/arch/arm/mach-at91/board-homematic.c
@@ -3324,9 +3298,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-homematic.c linux-2.6/arc
 +      .init_irq       = homematic_init_irq,
 +      .init_machine   = homematic_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-kb9202.c linux-2.6/arch/arm/mach-at91/board-kb9202.c
---- linux-2.6.25/arch/arm/mach-at91/board-kb9202.c     2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-kb9202.c        2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/board-kb9202.c
++++ b/arch/arm/mach-at91/board-kb9202.c
 @@ -37,19 +37,10 @@
  #include <asm/arch/board.h>
  #include <asm/arch/gpio.h>
@@ -3430,9 +3403,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-kb9202.c linux-2.6/arch/a
  }
  
  MACHINE_START(KB9200, "KB920x")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-qil-a9260.c linux-2.6/arch/arm/mach-at91/board-qil-a9260.c
---- linux-2.6.25/arch/arm/mach-at91/board-qil-a9260.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-qil-a9260.c     2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-qil-a9260.c
 @@ -0,0 +1,255 @@
 +/*
 + * linux/arch/arm/mach-at91/board-qil-a9260.c
@@ -3689,9 +3661,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-qil-a9260.c linux-2.6/arc
 +      .init_irq       = ek_init_irq,
 +      .init_machine   = ek_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9-l9260.c linux-2.6/arch/arm/mach-at91/board-sam9-l9260.c
---- linux-2.6.25/arch/arm/mach-at91/board-sam9-l9260.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-sam9-l9260.c    2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-sam9-l9260.c
 @@ -0,0 +1,199 @@
 +/*
 + * linux/arch/arm/mach-at91/board-sam9-l9260.c
@@ -3892,9 +3863,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9-l9260.c linux-2.6/ar
 +      .init_irq       = ek_init_irq,
 +      .init_machine   = ek_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9260ek.c linux-2.6/arch/arm/mach-at91/board-sam9260ek.c
---- linux-2.6.25/arch/arm/mach-at91/board-sam9260ek.c  2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-sam9260ek.c     2008-05-01 23:56:24.000000000 +0200
+--- a/arch/arm/mach-at91/board-sam9260ek.c
++++ b/arch/arm/mach-at91/board-sam9260ek.c
 @@ -25,6 +25,10 @@
  #include <linux/module.h>
  #include <linux/platform_device.h>
@@ -4087,9 +4057,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9260ek.c linux-2.6/arc
  }
  
  MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9261ek.c linux-2.6/arch/arm/mach-at91/board-sam9261ek.c
---- linux-2.6.25/arch/arm/mach-at91/board-sam9261ek.c  2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-sam9261ek.c     2008-05-01 23:53:20.000000000 +0200
+--- a/arch/arm/mach-at91/board-sam9261ek.c
++++ b/arch/arm/mach-at91/board-sam9261ek.c
 @@ -26,6 +26,8 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
@@ -4296,9 +4265,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9261ek.c linux-2.6/arc
  }
  
  MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9263ek.c linux-2.6/arch/arm/mach-at91/board-sam9263ek.c
---- linux-2.6.25/arch/arm/mach-at91/board-sam9263ek.c  2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-sam9263ek.c     2008-05-01 23:53:20.000000000 +0200
+--- a/arch/arm/mach-at91/board-sam9263ek.c
++++ b/arch/arm/mach-at91/board-sam9263ek.c
 @@ -43,29 +43,24 @@
  
  #include <asm/arch/board.h>
@@ -4378,9 +4346,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9263ek.c linux-2.6/arc
  }
  
  MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9rlek.c linux-2.6/arch/arm/mach-at91/board-sam9rlek.c
---- linux-2.6.25/arch/arm/mach-at91/board-sam9rlek.c   2008-05-03 00:15:33.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-sam9rlek.c      2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/board-sam9rlek.c
++++ b/arch/arm/mach-at91/board-sam9rlek.c
 @@ -29,29 +29,24 @@
  
  #include <asm/arch/board.h>
@@ -4454,9 +4421,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-sam9rlek.c linux-2.6/arch
  }
  
  MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-tms.c linux-2.6/arch/arm/mach-at91/board-tms.c
---- linux-2.6.25/arch/arm/mach-at91/board-tms.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-tms.c   2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-tms.c
 @@ -0,0 +1,198 @@
 +/*
 +* linux/arch/arm/mach-at91/board-tms.c
@@ -4656,9 +4622,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-tms.c linux-2.6/arch/arm/
 +      .init_irq       = tms_init_irq,
 +      .init_machine   = tms_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-tt9200.c linux-2.6/arch/arm/mach-at91/board-tt9200.c
---- linux-2.6.25/arch/arm/mach-at91/board-tt9200.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-tt9200.c        2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-tt9200.c
 @@ -0,0 +1,192 @@
 +/*
 + * linux/arch/arm/mach-at91rm9200/board-tt9200.c
@@ -4852,9 +4817,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-tt9200.c linux-2.6/arch/a
 +      .init_irq       = tt9200_init_irq,
 +      .init_machine   = tt9200_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-usb-a9260.c linux-2.6/arch/arm/mach-at91/board-usb-a9260.c
---- linux-2.6.25/arch/arm/mach-at91/board-usb-a9260.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-usb-a9260.c     2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-usb-a9260.c
 @@ -0,0 +1,215 @@
 +/*
 + * linux/arch/arm/mach-at91/board-usb-a9260.c
@@ -5071,9 +5035,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-usb-a9260.c linux-2.6/arc
 +      .init_irq       = ek_init_irq,
 +      .init_machine   = ek_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-usb-a9263.c linux-2.6/arch/arm/mach-at91/board-usb-a9263.c
---- linux-2.6.25/arch/arm/mach-at91/board-usb-a9263.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/board-usb-a9263.c     2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-usb-a9263.c
 @@ -0,0 +1,230 @@
 +/*
 + * linux/arch/arm/mach-at91/board-usb-a9263.c
@@ -5305,9 +5268,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/board-usb-a9263.c linux-2.6/arc
 +      .init_irq       = ek_init_irq,
 +      .init_machine   = ek_board_init,
 +MACHINE_END
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/clock.c linux-2.6/arch/arm/mach-at91/clock.c
---- linux-2.6.25/arch/arm/mach-at91/clock.c    2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/clock.c       2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/clock.c
++++ b/arch/arm/mach-at91/clock.c
 @@ -32,6 +32,7 @@
  #include <asm/arch/cpu.h>
  
@@ -5433,9 +5395,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/clock.c linux-2.6/arch/arm/mach
        /* MCK and CPU clock are "always on" */
        clk_enable(&mck);
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/generic.h linux-2.6/arch/arm/mach-at91/generic.h
---- linux-2.6.25/arch/arm/mach-at91/generic.h  2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/generic.h     2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/generic.h
++++ b/arch/arm/mach-at91/generic.h
 @@ -41,6 +41,7 @@
   /* Power Management */
  extern void at91_irq_suspend(void);
@@ -5444,9 +5405,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/generic.h linux-2.6/arch/arm/ma
  
   /* GPIO */
  #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/gpio.c linux-2.6/arch/arm/mach-at91/gpio.c
---- linux-2.6.25/arch/arm/mach-at91/gpio.c     2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/gpio.c        2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/gpio.c
++++ b/arch/arm/mach-at91/gpio.c
 @@ -490,7 +490,8 @@
  
  /*--------------------------------------------------------------------------*/
@@ -5465,9 +5425,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/gpio.c linux-2.6/arch/arm/mach-
                if (last && last->id == data->id)
                        last->next = data;
        }
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/ics1523.c linux-2.6/arch/arm/mach-at91/ics1523.c
---- linux-2.6.25/arch/arm/mach-at91/ics1523.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/ics1523.c     2008-04-25 21:15:43.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/ics1523.c
 @@ -0,0 +1,208 @@
 +/*
 + * arch/arm/mach-at91rm9200/ics1523.c
@@ -5677,9 +5636,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/ics1523.c linux-2.6/arch/arm/ma
 +
 +      return ack;
 +}
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/pm.c linux-2.6/arch/arm/mach-at91/pm.c
---- linux-2.6.25/arch/arm/mach-at91/pm.c       2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/pm.c  2008-04-25 21:15:43.000000000 +0200
+--- a/arch/arm/mach-at91/pm.c
++++ b/arch/arm/mach-at91/pm.c
 @@ -26,12 +26,144 @@
  #include <asm/mach-types.h>
  
@@ -5940,9 +5898,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/pm.c linux-2.6/arch/arm/mach-at
        return 0;
  }
  arch_initcall(at91_pm_init);
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/pm_slowclock.S linux-2.6/arch/arm/mach-at91/pm_slowclock.S
---- linux-2.6.25/arch/arm/mach-at91/pm_slowclock.S     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-at91/pm_slowclock.S        2008-05-03 01:00:33.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/pm_slowclock.S
 @@ -0,0 +1,283 @@
 +/*
 + * arch/arm/mach-at91/pm_slow_clock.S
@@ -6227,9 +6184,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/pm_slowclock.S linux-2.6/arch/a
 +
 +ENTRY(at91_slow_clock_sz)
 +      .word .-at91_slow_clock
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/Makefile linux-2.6/arch/arm/mach-ks8695/Makefile
---- linux-2.6.25/arch/arm/mach-ks8695/Makefile 2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-ks8695/Makefile    2007-12-31 15:04:45.000000000 +0200
+--- a/arch/arm/mach-ks8695/Makefile
++++ b/arch/arm/mach-ks8695/Makefile
 @@ -11,5 +11,8 @@
  # PCI support is optional
  obj-$(CONFIG_PCI)             += pci.o
@@ -6239,9 +6195,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/Makefile linux-2.6/arch/arm/m
 +
  # Board-specific support
  obj-$(CONFIG_MACH_KS8695)     += board-micrel.o
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/devices.c linux-2.6/arch/arm/mach-ks8695/devices.c
---- linux-2.6.25/arch/arm/mach-ks8695/devices.c        2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/arch/arm/mach-ks8695/devices.c   2007-12-31 10:43:55.000000000 +0200
+--- a/arch/arm/mach-ks8695/devices.c
++++ b/arch/arm/mach-ks8695/devices.c
 @@ -176,6 +176,27 @@
  #endif
  
@@ -6270,9 +6225,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/devices.c linux-2.6/arch/arm/
  /* -------------------------------------------------------------------- */
  
  /*
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/gpio.c linux-2.6/arch/arm/mach-ks8695/gpio.c
---- linux-2.6.25/arch/arm/mach-ks8695/gpio.c   2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-ks8695/gpio.c      2007-12-31 14:49:20.000000000 +0200
+--- a/arch/arm/mach-ks8695/gpio.c
++++ b/arch/arm/mach-ks8695/gpio.c
 @@ -136,9 +136,9 @@
        /* set line state */
        x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
@@ -6306,9 +6260,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/gpio.c linux-2.6/arch/arm/mac
  }
  EXPORT_SYMBOL(gpio_get_value);
  
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/leds.c linux-2.6/arch/arm/mach-ks8695/leds.c
---- linux-2.6.25/arch/arm/mach-ks8695/leds.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/arch/arm/mach-ks8695/leds.c      2007-12-31 15:18:25.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-ks8695/leds.c
 @@ -0,0 +1,94 @@
 +/*
 + * LED driver for KS8695-based boards.
@@ -6404,9 +6357,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/leds.c linux-2.6/arch/arm/mac
 +}
 +
 +__initcall(leds_init);
-diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/pci.c linux-2.6/arch/arm/mach-ks8695/pci.c
---- linux-2.6.25/arch/arm/mach-ks8695/pci.c    2008-05-03 00:15:44.000000000 +0200
-+++ linux-2.6/arch/arm/mach-ks8695/pci.c       2008-05-08 22:03:41.000000000 +0200
+--- a/arch/arm/mach-ks8695/pci.c
++++ b/arch/arm/mach-ks8695/pci.c
 @@ -141,7 +141,7 @@
        .write  = ks8695_pci_writeconfig,
  };
@@ -6416,9 +6368,8 @@ diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/pci.c linux-2.6/arch/arm/mach
  {
        return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys);
  }
-diff -urN -x CVS linux-2.6.25/drivers/char/Kconfig linux-2.6/drivers/char/Kconfig
---- linux-2.6.25/drivers/char/Kconfig  2008-05-03 00:15:47.000000000 +0200
-+++ linux-2.6/drivers/char/Kconfig     2008-03-09 15:14:46.000000000 +0200
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
 @@ -1056,5 +1056,21 @@
  
  source "drivers/s390/char/Kconfig"
@@ -6441,9 +6392,8 @@ diff -urN -x CVS linux-2.6.25/drivers/char/Kconfig linux-2.6/drivers/char/Kconfi
 +
  endmenu
  
-diff -urN -x CVS linux-2.6.25/drivers/char/Makefile linux-2.6/drivers/char/Makefile
---- linux-2.6.25/drivers/char/Makefile 2008-05-03 00:15:47.000000000 +0200
-+++ linux-2.6/drivers/char/Makefile    2008-03-09 15:14:46.000000000 +0200
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
 @@ -98,6 +98,8 @@
  obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
  obj-$(CONFIG_GPIO_TB0219)     += tb0219.o
@@ -6453,9 +6403,8 @@ diff -urN -x CVS linux-2.6.25/drivers/char/Makefile linux-2.6/drivers/char/Makef
  
  obj-$(CONFIG_MWAVE)           += mwave/
  obj-$(CONFIG_AGP)             += agp/
-diff -urN -x CVS linux-2.6.25/drivers/char/at91_spi.c linux-2.6/drivers/char/at91_spi.c
---- linux-2.6.25/drivers/char/at91_spi.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/char/at91_spi.c  2008-04-18 17:38:01.000000000 +0200
+--- /dev/null
++++ b/drivers/char/at91_spi.c
 @@ -0,0 +1,337 @@
 +/*
 + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
@@ -6794,9 +6743,8 @@ diff -urN -x CVS linux-2.6.25/drivers/char/at91_spi.c linux-2.6/drivers/char/at9
 +MODULE_AUTHOR("Andrew Victor")
 +MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
 +MODULE_ALIAS("platform:at91_spi");
-diff -urN -x CVS linux-2.6.25/drivers/char/at91_spidev.c linux-2.6/drivers/char/at91_spidev.c
---- linux-2.6.25/drivers/char/at91_spidev.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/char/at91_spidev.c       2007-12-31 15:18:43.000000000 +0200
+--- /dev/null
++++ b/drivers/char/at91_spidev.c
 @@ -0,0 +1,233 @@
 +/*
 + * User-space interface to the SPI bus on Atmel AT91RM9200
@@ -7031,9 +6979,8 @@ diff -urN -x CVS linux-2.6.25/drivers/char/at91_spidev.c linux-2.6/drivers/char/
 +MODULE_LICENSE("GPL")
 +MODULE_AUTHOR("Andrew Victor")
 +MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
-diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Kconfig linux-2.6/drivers/i2c/busses/Kconfig
---- linux-2.6.25/drivers/i2c/busses/Kconfig    2008-05-03 00:15:47.000000000 +0200
-+++ linux-2.6/drivers/i2c/busses/Kconfig       2008-04-02 22:11:28.000000000 +0200
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
 @@ -88,6 +88,14 @@
          to support combined I2C messages.  Use the i2c-gpio driver
          unless your system can cope with those limitations.
@@ -7064,9 +7011,8 @@ diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Kconfig linux-2.6/drivers/i2c/b
  config I2C_PCA_ISA
        tristate "PCA9564 on an ISA bus"
        depends on ISA
-diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Makefile linux-2.6/drivers/i2c/busses/Makefile
---- linux-2.6.25/drivers/i2c/busses/Makefile   2008-05-03 00:15:47.000000000 +0200
-+++ linux-2.6/drivers/i2c/busses/Makefile      2008-03-09 15:14:46.000000000 +0200
+--- a/drivers/i2c/busses/Makefile
++++ b/drivers/i2c/busses/Makefile
 @@ -29,6 +29,7 @@
  obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
  obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
@@ -7075,9 +7021,8 @@ diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Makefile linux-2.6/drivers/i2c/
  obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
  obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
  obj-$(CONFIG_I2C_PMCMSP)      += i2c-pmcmsp.o
-diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-at91.c linux-2.6/drivers/i2c/busses/i2c-at91.c
---- linux-2.6.25/drivers/i2c/busses/i2c-at91.c 2008-05-03 00:15:35.000000000 +0200
-+++ linux-2.6/drivers/i2c/busses/i2c-at91.c    2008-01-16 13:15:34.000000000 +0200
+--- a/drivers/i2c/busses/i2c-at91.c
++++ b/drivers/i2c/busses/i2c-at91.c
 @@ -31,8 +31,11 @@
  #include <asm/arch/board.h>
  #include <asm/arch/cpu.h>
@@ -7118,9 +7063,8 @@ diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-at91.c linux-2.6/drivers/i2
        }
  
        at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
-diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-pca.c linux-2.6/drivers/i2c/busses/i2c-pca.c
---- linux-2.6.25/drivers/i2c/busses/i2c-pca.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/i2c/busses/i2c-pca.c     2007-12-31 15:18:43.000000000 +0200
+--- /dev/null
++++ b/drivers/i2c/busses/i2c-pca.c
 @@ -0,0 +1,213 @@
 +/*
 + *  Platform driver for PCA9564 I2C bus controller.
@@ -7335,9 +7279,8 @@ diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-pca.c linux-2.6/drivers/i2c
 +MODULE_AUTHOR("Andrew Victor");
 +MODULE_DESCRIPTION("PCA9564 platform driver");
 +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.25/drivers/mmc/host/at91_mci.c linux-2.6/drivers/mmc/host/at91_mci.c
---- linux-2.6.25/drivers/mmc/host/at91_mci.c   2008-05-03 00:15:48.000000000 +0200
-+++ linux-2.6/drivers/mmc/host/at91_mci.c      2008-04-18 17:32:40.000000000 +0200
+--- a/drivers/mmc/host/at91_mci.c
++++ b/drivers/mmc/host/at91_mci.c
 @@ -659,13 +659,14 @@
        /* maybe switch power to the card */
        if (host->board->vcc_pin) {
@@ -7360,9 +7303,8 @@ diff -urN -x CVS linux-2.6.25/drivers/mmc/host/at91_mci.c linux-2.6/drivers/mmc/
                }
        }
  }
-diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/Kconfig linux-2.6/drivers/mtd/devices/Kconfig
---- linux-2.6.25/drivers/mtd/devices/Kconfig   2008-05-03 00:15:36.000000000 +0200
-+++ linux-2.6/drivers/mtd/devices/Kconfig      2007-12-31 10:44:25.000000000 +0200
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
 @@ -270,5 +270,17 @@
          LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
          you have managed to wipe the first block.
@@ -7382,17 +7324,15 @@ diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/Kconfig linux-2.6/drivers/mtd/
 +        Always add the whole DataFlash device when using MTD partitions.
  
 +endmenu
-diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/Makefile linux-2.6/drivers/mtd/devices/Makefile
---- linux-2.6.25/drivers/mtd/devices/Makefile  2008-05-03 00:15:36.000000000 +0200
-+++ linux-2.6/drivers/mtd/devices/Makefile     2007-12-31 10:48:27.000000000 +0200
+--- a/drivers/mtd/devices/Makefile
++++ b/drivers/mtd/devices/Makefile
 @@ -17,3 +17,4 @@
  obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
  obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
  obj-$(CONFIG_MTD_M25P80)      += m25p80.o
 +obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
-diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/at91_dataflash.c linux-2.6/drivers/mtd/devices/at91_dataflash.c
---- linux-2.6.25/drivers/mtd/devices/at91_dataflash.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/mtd/devices/at91_dataflash.c     2007-12-31 15:18:43.000000000 +0200
+--- /dev/null
++++ b/drivers/mtd/devices/at91_dataflash.c
 @@ -0,0 +1,673 @@
 +/*
 + * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
@@ -8067,9 +8007,8 @@ diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/at91_dataflash.c linux-2.6/dri
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Andrew Victor");
 +MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
-diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/Kconfig linux-2.6/drivers/mtd/nand/Kconfig
---- linux-2.6.25/drivers/mtd/nand/Kconfig      2008-05-03 00:15:48.000000000 +0200
-+++ linux-2.6/drivers/mtd/nand/Kconfig 2008-04-18 17:52:53.000000000 +0200
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
 @@ -273,12 +273,53 @@
          If you say "m", the module will be called "cs553x_nand.ko".
  
@@ -8125,9 +8064,8 @@ diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/Kconfig linux-2.6/drivers/mtd/nan
  config MTD_NAND_CM_X270
        tristate "Support for NAND Flash on CM-X270 modules"
        depends on MTD_NAND && MACH_ARMCORE
-diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/at91_nand.c linux-2.6/drivers/mtd/nand/at91_nand.c
---- linux-2.6.25/drivers/mtd/nand/at91_nand.c  2008-05-03 00:15:48.000000000 +0200
-+++ linux-2.6/drivers/mtd/nand/at91_nand.c     2008-05-03 00:53:39.000000000 +0200
+--- a/drivers/mtd/nand/at91_nand.c
++++ b/drivers/mtd/nand/at91_nand.c
 @@ -9,6 +9,15 @@
   *  Derived from drivers/mtd/spia.c
   *     Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
@@ -8677,9 +8615,8 @@ diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/at91_nand.c linux-2.6/drivers/mtd
  MODULE_AUTHOR("Rick Bronson");
 -MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200");
 +MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200 / AT91SAM9 / AT91CAP9");
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/Kconfig linux-2.6/drivers/net/arm/Kconfig
---- linux-2.6.25/drivers/net/arm/Kconfig       2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/drivers/net/arm/Kconfig  2008-03-04 21:52:40.000000000 +0200
+--- a/drivers/net/arm/Kconfig
++++ b/drivers/net/arm/Kconfig
 @@ -47,3 +47,10 @@
        help
          This is a driver for the ethernet hardware included in EP93xx CPUs.
@@ -8691,17 +8628,15 @@ diff -urN -x CVS linux-2.6.25/drivers/net/arm/Kconfig linux-2.6/drivers/net/arm/
 +      help
 +        If you wish to compile a kernel for an KS8695-based board
 +        and enable Ethernet support, then select this option.
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/Makefile linux-2.6/drivers/net/arm/Makefile
---- linux-2.6.25/drivers/net/arm/Makefile      2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/drivers/net/arm/Makefile 2008-03-04 21:51:41.000000000 +0200
+--- a/drivers/net/arm/Makefile
++++ b/drivers/net/arm/Makefile
 @@ -9,3 +9,4 @@
  obj-$(CONFIG_ARM_ETHER1)      += ether1.o
  obj-$(CONFIG_ARM_AT91_ETHER)  += at91_ether.o
  obj-$(CONFIG_EP93XX_ETH)      += ep93xx_eth.o
 +obj-$(CONFIG_ARM_KS8695_ETHER)        += ks8695_ether.o
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.c linux-2.6/drivers/net/arm/at91_ether.c
---- linux-2.6.25/drivers/net/arm/at91_ether.c  2008-05-03 00:15:48.000000000 +0200
-+++ linux-2.6/drivers/net/arm/at91_ether.c     2008-05-08 21:47:22.000000000 +0200
+--- a/drivers/net/arm/at91_ether.c
++++ b/drivers/net/arm/at91_ether.c
 @@ -220,7 +220,7 @@
                if (!(phy & (1 << 0)))
                        goto done;
@@ -8892,9 +8827,8 @@ diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.c linux-2.6/drivers/net
  MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");
  MODULE_AUTHOR("Andrew Victor");
 +MODULE_ALIAS("platform:" DRV_NAME);
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.h linux-2.6/drivers/net/arm/at91_ether.h
---- linux-2.6.25/drivers/net/arm/at91_ether.h  2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/drivers/net/arm/at91_ether.h     2008-05-08 21:47:31.000000000 +0200
+--- a/drivers/net/arm/at91_ether.h
++++ b/drivers/net/arm/at91_ether.h
 @@ -48,6 +48,9 @@
  /* Altima AC101L PHY */
  #define MII_AC101L_ID         0x00225520
@@ -8913,9 +8847,8 @@ diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.h linux-2.6/drivers/net
        struct mii_if_info mii;                 /* ethtool support */
        struct at91_eth_data board_data;        /* board-specific configuration */
        struct clk *ether_clk;                  /* clock */
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.c linux-2.6/drivers/net/arm/ks8695_ether.c
---- linux-2.6.25/drivers/net/arm/ks8695_ether.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/net/arm/ks8695_ether.c   2008-05-08 21:52:35.000000000 +0200
+--- /dev/null
++++ b/drivers/net/arm/ks8695_ether.c
 @@ -0,0 +1,1009 @@
 +/*
 + * Ethernet driver for the Kendin/Micrel KS8695.
@@ -9926,9 +9859,8 @@ diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.c linux-2.6/drivers/n
 +MODULE_DESCRIPTION("KS8695 Ethernet driver");
 +MODULE_AUTHOR("Andrew Victor");
 +MODULE_ALIAS("platform:" DRV_NAME);
-diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.h linux-2.6/drivers/net/arm/ks8695_ether.h
---- linux-2.6.25/drivers/net/arm/ks8695_ether.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/net/arm/ks8695_ether.h   2008-05-08 21:51:23.000000000 +0200
+--- /dev/null
++++ b/drivers/net/arm/ks8695_ether.h
 @@ -0,0 +1,92 @@
 +/*
 + * Ethernet driver for the Micrel/Kendin KS8695 (Centaur)
@@ -10022,9 +9954,8 @@ diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.h linux-2.6/drivers/n
 +};
 +
 +#endif
-diff -urN -x CVS linux-2.6.25/drivers/rtc/Kconfig linux-2.6/drivers/rtc/Kconfig
---- linux-2.6.25/drivers/rtc/Kconfig   2008-05-03 00:15:49.000000000 +0200
-+++ linux-2.6/drivers/rtc/Kconfig      2008-04-15 21:48:11.000000000 +0200
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
 @@ -487,12 +487,12 @@
          this is powered by the backup power supply.
  
@@ -10042,9 +9973,8 @@ diff -urN -x CVS linux-2.6.25/drivers/rtc/Kconfig linux-2.6/drivers/rtc/Kconfig
  
          (On AT91SAM9rl chips you probably want to use the dedicated RTC
          module and leave the RTT available for other uses.)
-diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91rm9200.c linux-2.6/drivers/rtc/rtc-at91rm9200.c
---- linux-2.6.25/drivers/rtc/rtc-at91rm9200.c  2008-05-03 00:15:49.000000000 +0200
-+++ linux-2.6/drivers/rtc/rtc-at91rm9200.c     2008-04-25 23:15:05.000000000 +0200
+--- a/drivers/rtc/rtc-at91rm9200.c
++++ b/drivers/rtc/rtc-at91rm9200.c
 @@ -29,9 +29,6 @@
  #include <linux/completion.h>
  
@@ -10068,9 +9998,8 @@ diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91rm9200.c linux-2.6/drivers/rtc
        rtc = rtc_device_register(pdev->name, &pdev->dev,
                                &at91_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc)) {
-diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91sam9.c linux-2.6/drivers/rtc/rtc-at91sam9.c
---- linux-2.6.25/drivers/rtc/rtc-at91sam9.c    2008-05-03 00:15:49.000000000 +0200
-+++ linux-2.6/drivers/rtc/rtc-at91sam9.c       2008-05-05 22:01:39.000000000 +0200
+--- a/drivers/rtc/rtc-at91sam9.c
++++ b/drivers/rtc/rtc-at91sam9.c
 @@ -21,6 +21,7 @@
  
  #include <asm/mach/time.h>
@@ -10110,12 +10039,11 @@ diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91sam9.c linux-2.6/drivers/rtc/r
        platform_set_drvdata(pdev, rtc);
        rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
        rtc->rtt += r->start;
-diff -urN -x CVS linux-2.6.25/drivers/spi/Kconfig linux-2.6/drivers/spi/Kconfig
---- linux-2.6.25/drivers/spi/Kconfig   2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/spi/Kconfig      2008-03-09 15:14:53.000000000 +0200
-@@ -105,6 +105,15 @@
-         inexpensive battery powered microcontroller evaluation board.
-         This same cable can be used to flash new firmware.
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -113,6 +113,15 @@
+         If unsure, say N.
  
 +config SPI_AT91
 +      tristate "AT91RM9200 Bitbang SPI Master"
@@ -10129,9 +10057,8 @@ diff -urN -x CVS linux-2.6.25/drivers/spi/Kconfig linux-2.6/drivers/spi/Kconfig
  config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-diff -urN -x CVS linux-2.6.25/drivers/spi/Makefile linux-2.6/drivers/spi/Makefile
---- linux-2.6.25/drivers/spi/Makefile  2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/spi/Makefile     2008-03-09 17:54:27.000000000 +0200
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
 @@ -29,6 +29,7 @@
  obj-$(CONFIG_SPI_TXX9)                        += spi_txx9.o
  obj-$(CONFIG_SPI_XILINX)              += xilinx_spi.o
@@ -10140,9 +10067,8 @@ diff -urN -x CVS linux-2.6.25/drivers/spi/Makefile linux-2.6/drivers/spi/Makefil
  #     ... add above this line ...
  
  # SPI protocol drivers (device/link on bus)
-diff -urN -x CVS linux-2.6.25/drivers/spi/spi_at91_bitbang.c linux-2.6/drivers/spi/spi_at91_bitbang.c
---- linux-2.6.25/drivers/spi/spi_at91_bitbang.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/spi/spi_at91_bitbang.c   2008-04-18 17:38:19.000000000 +0200
+--- /dev/null
++++ b/drivers/spi/spi_at91_bitbang.c
 @@ -0,0 +1,208 @@
 +/*
 + * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
@@ -10352,9 +10278,8 @@ diff -urN -x CVS linux-2.6.25/drivers/spi/spi_at91_bitbang.c linux-2.6/drivers/s
 +MODULE_AUTHOR("David Brownell");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:at91_spi");
-diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/Kconfig linux-2.6/drivers/usb/gadget/Kconfig
---- linux-2.6.25/drivers/usb/gadget/Kconfig    2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/usb/gadget/Kconfig       2008-04-18 19:23:34.000000000 +0200
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
 @@ -118,10 +118,10 @@
  config USB_GADGET_ATMEL_USBA
        boolean "Atmel USBA"
@@ -10368,9 +10293,8 @@ diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/Kconfig linux-2.6/drivers/usb/g
  
  config USB_ATMEL_USBA
        tristate
-diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/at91_udc.c linux-2.6/drivers/usb/gadget/at91_udc.c
---- linux-2.6.25/drivers/usb/gadget/at91_udc.c 2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/usb/gadget/at91_udc.c    2008-04-15 21:48:12.000000000 +0200
+--- a/drivers/usb/gadget/at91_udc.c
++++ b/drivers/usb/gadget/at91_udc.c
 @@ -1827,7 +1827,7 @@
         */
        if ((!udc->suspended && udc->addr)
@@ -10380,9 +10304,8 @@ diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/at91_udc.c linux-2.6/drivers/us
                pullup(udc, 0);
                wake = 0;
        } else
-diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/atmel_usba_udc.c linux-2.6/drivers/usb/gadget/atmel_usba_udc.c
---- linux-2.6.25/drivers/usb/gadget/atmel_usba_udc.c   2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/usb/gadget/atmel_usba_udc.c      2008-05-03 01:07:46.000000000 +0200
+--- a/drivers/usb/gadget/atmel_usba_udc.c
++++ b/drivers/usb/gadget/atmel_usba_udc.c
 @@ -18,6 +18,7 @@
  #include <linux/platform_device.h>
  #include <linux/usb/ch9.h>
@@ -10633,9 +10556,8 @@ diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/atmel_usba_udc.c linux-2.6/driv
                usba_ep_cleanup_debugfs(&usba_ep[i]);
        usba_cleanup_debugfs(udc);
  
-diff -urN -x CVS linux-2.6.25/drivers/usb/host/ohci-at91.c linux-2.6/drivers/usb/host/ohci-at91.c
---- linux-2.6.25/drivers/usb/host/ohci-at91.c  2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/usb/host/ohci-at91.c     2008-04-15 21:48:12.000000000 +0200
+--- a/drivers/usb/host/ohci-at91.c
++++ b/drivers/usb/host/ohci-at91.c
 @@ -330,7 +330,7 @@
         *
         * REVISIT: some boards will be able to turn VBUS off...
@@ -10645,9 +10567,8 @@ diff -urN -x CVS linux-2.6.25/drivers/usb/host/ohci-at91.c linux-2.6/drivers/usb
                ohci_usb_reset (ohci);
                at91_stop_clock();
        }
-diff -urN -x CVS linux-2.6.25/drivers/video/Kconfig linux-2.6/drivers/video/Kconfig
---- linux-2.6.25/drivers/video/Kconfig 2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/video/Kconfig    2008-04-02 22:11:30.000000000 +0200
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
 @@ -889,6 +889,17 @@
          framebuffer.  Product specs at
          <http://www.erd.epson.com/vdc/html/products.htm>.
@@ -10666,9 +10587,8 @@ diff -urN -x CVS linux-2.6.25/drivers/video/Kconfig linux-2.6/drivers/video/Kcon
  config FB_S1D13XXX
        tristate "Epson S1D13XXX framebuffer support"
        depends on FB
-diff -urN -x CVS linux-2.6.25/drivers/video/Makefile linux-2.6/drivers/video/Makefile
---- linux-2.6.25/drivers/video/Makefile        2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/video/Makefile   2008-04-02 22:11:30.000000000 +0200
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
 @@ -87,7 +87,8 @@
  obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
  obj-$(CONFIG_FB_HIT)              += hitfb.o
@@ -10679,9 +10599,8 @@ diff -urN -x CVS linux-2.6.25/drivers/video/Makefile linux-2.6/drivers/video/Mak
  obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
  obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
  obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
-diff -urN -x CVS linux-2.6.25/drivers/video/atmel_lcdfb.c linux-2.6/drivers/video/atmel_lcdfb.c
---- linux-2.6.25/drivers/video/atmel_lcdfb.c   2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/video/atmel_lcdfb.c      2008-04-03 00:27:47.000000000 +0200
+--- a/drivers/video/atmel_lcdfb.c
++++ b/drivers/video/atmel_lcdfb.c
 @@ -31,7 +31,7 @@
  #define ATMEL_LCDC_CVAL_DEFAULT               0xc8
  #define ATMEL_LCDC_DMA_BURST_LEN      8
@@ -10740,9 +10659,8 @@ diff -urN -x CVS linux-2.6.25/drivers/video/atmel_lcdfb.c linux-2.6/drivers/vide
        .driver         = {
                .name   = "atmel_lcdfb",
                .owner  = THIS_MODULE,
-diff -urN -x CVS linux-2.6.25/drivers/video/backlight/Kconfig linux-2.6/drivers/video/backlight/Kconfig
---- linux-2.6.25/drivers/video/backlight/Kconfig       2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/video/backlight/Kconfig  2008-03-09 18:51:50.000000000 +0200
+--- a/drivers/video/backlight/Kconfig
++++ b/drivers/video/backlight/Kconfig
 @@ -112,3 +112,11 @@
        help
          If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
@@ -10755,17 +10673,15 @@ diff -urN -x CVS linux-2.6.25/drivers/video/backlight/Kconfig linux-2.6/drivers/
 +      help
 +        If you have a KwikByte KB9202 board, say Y to enable the
 +        backlight driver.
-diff -urN -x CVS linux-2.6.25/drivers/video/backlight/Makefile linux-2.6/drivers/video/backlight/Makefile
---- linux-2.6.25/drivers/video/backlight/Makefile      2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/video/backlight/Makefile 2008-03-09 15:14:55.000000000 +0200
+--- a/drivers/video/backlight/Makefile
++++ b/drivers/video/backlight/Makefile
 @@ -10,3 +10,4 @@
  obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o
  obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
  obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 +obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
-diff -urN -x CVS linux-2.6.25/drivers/video/backlight/kb920x_bl.c linux-2.6/drivers/video/backlight/kb920x_bl.c
---- linux-2.6.25/drivers/video/backlight/kb920x_bl.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/video/backlight/kb920x_bl.c      2008-03-09 21:41:20.000000000 +0200
+--- /dev/null
++++ b/drivers/video/backlight/kb920x_bl.c
 @@ -0,0 +1,164 @@
 +/*
 + * Backlight Driver for KB9202
@@ -10931,9 +10847,8 @@ diff -urN -x CVS linux-2.6.25/drivers/video/backlight/kb920x_bl.c linux-2.6/driv
 +MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
 +MODULE_DESCRIPTION("KB9202 Backlight Driver");
 +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.25/drivers/video/s1d15605fb.c linux-2.6/drivers/video/s1d15605fb.c
---- linux-2.6.25/drivers/video/s1d15605fb.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/video/s1d15605fb.c       2008-05-03 00:36:04.000000000 +0200
+--- /dev/null
++++ b/drivers/video/s1d15605fb.c
 @@ -0,0 +1,655 @@
 +/*
 + *  drivers/video/s1d15605.c
@@ -11590,9 +11505,8 @@ diff -urN -x CVS linux-2.6.25/drivers/video/s1d15605fb.c linux-2.6/drivers/video
 +MODULE_AUTHOR("KwikByte");
 +MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
 +MODULE_LICENSE("GPL");
-diff -urN -x CVS linux-2.6.25/drivers/watchdog/Kconfig linux-2.6/drivers/watchdog/Kconfig
---- linux-2.6.25/drivers/watchdog/Kconfig      2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/watchdog/Kconfig 2008-03-09 15:14:55.000000000 +0200
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
 @@ -66,6 +66,14 @@
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
@@ -11608,9 +11522,8 @@ diff -urN -x CVS linux-2.6.25/drivers/watchdog/Kconfig linux-2.6/drivers/watchdo
  config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE
-diff -urN -x CVS linux-2.6.25/drivers/watchdog/Makefile linux-2.6/drivers/watchdog/Makefile
---- linux-2.6.25/drivers/watchdog/Makefile     2008-05-03 00:15:50.000000000 +0200
-+++ linux-2.6/drivers/watchdog/Makefile        2008-03-09 15:14:55.000000000 +0200
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
 @@ -26,6 +26,7 @@
  
  # ARM Architecture
@@ -11619,9 +11532,8 @@ diff -urN -x CVS linux-2.6.25/drivers/watchdog/Makefile linux-2.6/drivers/watchd
  obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
  obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
  obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-diff -urN -x CVS linux-2.6.25/drivers/watchdog/at91sam9_wdt.c linux-2.6/drivers/watchdog/at91sam9_wdt.c
---- linux-2.6.25/drivers/watchdog/at91sam9_wdt.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/drivers/watchdog/at91sam9_wdt.c  2008-04-15 21:53:41.000000000 +0200
+--- /dev/null
++++ b/drivers/watchdog/at91sam9_wdt.c
 @@ -0,0 +1,259 @@
 +/*
 + * Watchdog driver for Atmel AT91SAM9x processors.
@@ -11882,9 +11794,8 @@ diff -urN -x CVS linux-2.6.25/drivers/watchdog/at91sam9_wdt.c linux-2.6/drivers/
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 +MODULE_ALIAS("platform:at91_wdt");
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_ecc.h linux-2.6/include/asm-arm/arch-at91/at91_ecc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_ecc.h  2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_ecc.h     2008-05-07 23:49:32.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_ecc.h
++++ b/include/asm-arm/arch-at91/at91_ecc.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_ecc.h
@@ -11927,9 +11838,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_ecc.h linux-2.6/inc
  #define               AT91_ECC_NPARITY        (0xffff << 0)           /* NParity */
  
  #endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_pit.h linux-2.6/include/asm-arm/arch-at91/at91_pit.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_pit.h  2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_pit.h     2008-05-07 23:49:57.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_pit.h
++++ b/include/asm-arm/arch-at91/at91_pit.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_pit.h
@@ -11940,9 +11850,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_pit.h linux-2.6/inc
   * Periodic Interval Timer (PIT) - System peripherals regsters.
   * Based on AT91SAM9261 datasheet revision D.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_pmc.h linux-2.6/include/asm-arm/arch-at91/at91_pmc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_pmc.h  2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_pmc.h     2008-05-05 22:01:39.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_pmc.h
++++ b/include/asm-arm/arch-at91/at91_pmc.h
 @@ -23,6 +23,7 @@
  #define               AT91_PMC_PCK            (1 <<  0)               /* Processor Clock */
  #define               AT91RM9200_PMC_UDP      (1 <<  1)               /* USB Devcice Port Clock [AT91RM9200 only] */
@@ -12011,9 +11920,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_pmc.h linux-2.6/inc
 +#define AT91_PMC_VER          (AT91_PMC + 0xfc)       /* PMC Module Version [AT91CAP9 only] */
 +
  #endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_rstc.h linux-2.6/include/asm-arm/arch-at91/at91_rstc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_rstc.h 2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_rstc.h    2008-05-07 23:50:10.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_rstc.h
++++ b/include/asm-arm/arch-at91/at91_rstc.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_rstc.h
@@ -12024,9 +11932,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_rstc.h linux-2.6/in
   * Reset Controller (RSTC) - System peripherals regsters.
   * Based on AT91SAM9261 datasheet revision D.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_rtt.h linux-2.6/include/asm-arm/arch-at91/at91_rtt.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_rtt.h  2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_rtt.h     2008-05-07 23:51:11.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_rtt.h
++++ b/include/asm-arm/arch-at91/at91_rtt.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_rtt.h
@@ -12037,9 +11944,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_rtt.h linux-2.6/inc
   * Real-time Timer (RTT) - System peripherals regsters.
   * Based on AT91SAM9261 datasheet revision D.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_shdwc.h linux-2.6/include/asm-arm/arch-at91/at91_shdwc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_shdwc.h        2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_shdwc.h   2008-05-07 23:50:23.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_shdwc.h
++++ b/include/asm-arm/arch-at91/at91_shdwc.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_shdwc.h
@@ -12063,9 +11969,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_shdwc.h linux-2.6/i
 +#define               AT91_SHDW_RTCWK         (1 << 17)               /* Real-time Clock Wake-up [SAM9RL] */
  
  #endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_tsc.h linux-2.6/include/asm-arm/arch-at91/at91_tsc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_tsc.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_tsc.h     2008-05-07 23:51:32.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/at91_tsc.h
 @@ -0,0 +1,76 @@
 +/*
 + * include/asm-arm/arch-at91/at91_tsc.h
@@ -12143,9 +12048,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_tsc.h linux-2.6/inc
 +
 +#endif
 +
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_wdt.h linux-2.6/include/asm-arm/arch-at91/at91_wdt.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91_wdt.h  2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91_wdt.h     2008-05-07 23:51:43.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91_wdt.h
++++ b/include/asm-arm/arch-at91/at91_wdt.h
 @@ -1,6 +1,9 @@
  /*
   * include/asm-arm/arch-at91/at91_wdt.h
@@ -12156,9 +12060,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91_wdt.h linux-2.6/inc
   * Watchdog Timer (WDT) - System peripherals regsters.
   * Based on AT91SAM9261 datasheet revision D.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9.h linux-2.6/include/asm-arm/arch-at91/at91cap9.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91cap9.h  2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91cap9.h     2008-05-05 22:01:39.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91cap9.h
++++ b/include/asm-arm/arch-at91/at91cap9.h
 @@ -101,7 +101,10 @@
  #define AT91_RTT      (0xfffffd20 - AT91_BASE_SYS)
  #define AT91_PIT      (0xfffffd30 - AT91_BASE_SYS)
@@ -12180,9 +12083,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9.h linux-2.6/inc
  #define AT91CAP9_UHP_BASE     0x00700000      /* USB Host controller */
  
  #define CONFIG_DRAM_BASE      AT91_CHIPSELECT_6
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9_ddrsdr.h linux-2.6/include/asm-arm/arch-at91/at91cap9_ddrsdr.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91cap9_ddrsdr.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91cap9_ddrsdr.h      2008-05-07 21:33:47.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/at91cap9_ddrsdr.h
 @@ -0,0 +1,102 @@
 +/*
 + * include/asm-arm/arch-at91/at91cap9_ddrsdr.h
@@ -12286,9 +12188,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9_ddrsdr.h linux-
 +
 +
 +#endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9_matrix.h linux-2.6/include/asm-arm/arch-at91/at91cap9_matrix.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91cap9_matrix.h   2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91cap9_matrix.h      2008-04-18 19:20:34.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91cap9_matrix.h
++++ b/include/asm-arm/arch-at91/at91cap9_matrix.h
 @@ -106,6 +106,11 @@
  #define AT91_MPBS0_SFR                (AT91_MATRIX + 0x114)   /* MPBlock Slave 0 Special Function Register */
  #define AT91_MPBS1_SFR                (AT91_MATRIX + 0x11C)   /* MPBlock Slave 1 Special Function Register */
@@ -12301,9 +12202,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91cap9_matrix.h linux-
  #define AT91_MATRIX_EBICSA    (AT91_MATRIX + 0x120)   /* EBI Chip Select Assignment Register */
  #define               AT91_MATRIX_EBI_CS1A            (1 << 1)        /* Chip Select 1 Assignment */
  #define                       AT91_MATRIX_EBI_CS1A_SMC                (0 << 1)
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9260_matrix.h linux-2.6/include/asm-arm/arch-at91/at91sam9260_matrix.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam9260_matrix.h        2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam9260_matrix.h   2008-05-07 12:07:13.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
++++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h
 @@ -1,6 +1,8 @@
  /*
   * include/asm-arm/arch-at91/at91sam9260_matrix.h
@@ -12313,9 +12213,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9260_matrix.h lin
   * Memory Controllers (MATRIX, EBI) - System peripherals registers.
   * Based on AT91SAM9260 datasheet revision B.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9261_matrix.h linux-2.6/include/asm-arm/arch-at91/at91sam9261_matrix.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam9261_matrix.h        2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam9261_matrix.h   2008-05-07 12:07:24.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91sam9261_matrix.h
++++ b/include/asm-arm/arch-at91/at91sam9261_matrix.h
 @@ -1,6 +1,8 @@
  /*
   * include/asm-arm/arch-at91/at91sam9261_matrix.h
@@ -12325,9 +12224,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9261_matrix.h lin
   * Memory Controllers (MATRIX, EBI) - System peripherals registers.
   * Based on AT91SAM9261 datasheet revision D.
   *
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam926x_mc.h linux-2.6/include/asm-arm/arch-at91/at91sam926x_mc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam926x_mc.h    2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam926x_mc.h       1970-01-01 02:00:00.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91sam926x_mc.h
++++ /dev/null
 @@ -1,141 +0,0 @@
 -/*
 - * include/asm-arm/arch-at91/at91sam926x_mc.h
@@ -12470,9 +12368,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam926x_mc.h linux-2
 -#endif
 -
 -#endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9_sdramc.h linux-2.6/include/asm-arm/arch-at91/at91sam9_sdramc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam9_sdramc.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam9_sdramc.h      2008-05-07 23:51:59.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/at91sam9_sdramc.h
 @@ -0,0 +1,86 @@
 +/*
 + * include/asm-arm/arch-at91/at91sam9_sdramc.h
@@ -12560,9 +12457,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9_sdramc.h linux-
 +
 +
 +#endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9_smc.h linux-2.6/include/asm-arm/arch-at91/at91sam9_smc.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam9_smc.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam9_smc.h 2008-05-07 23:52:15.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/at91sam9_smc.h
 @@ -0,0 +1,76 @@
 +/*
 + * include/asm-arm/arch-at91/at91sam9_smc.h
@@ -12640,9 +12536,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9_smc.h linux-2.6
 +#endif
 +
 +#endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9rl.h linux-2.6/include/asm-arm/arch-at91/at91sam9rl.h
---- linux-2.6.25/include/asm-arm/arch-at91/at91sam9rl.h        2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/at91sam9rl.h   2008-04-18 19:22:02.000000000 +0200
+--- a/include/asm-arm/arch-at91/at91sam9rl.h
++++ b/include/asm-arm/arch-at91/at91sam9rl.h
 @@ -110,6 +110,6 @@
  #define AT91SAM9RL_ROM_SIZE   (2 * SZ_16K)    /* Internal ROM size (32Kb) */
  
@@ -12651,9 +12546,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/at91sam9rl.h linux-2.6/i
 +#define AT91SAM9RL_UDPHS_FIFO 0x00600000      /* USB Device HS controller */
  
  #endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/board.h linux-2.6/include/asm-arm/arch-at91/board.h
---- linux-2.6.25/include/asm-arm/arch-at91/board.h     2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/board.h        2008-05-02 00:40:32.000000000 +0200
+--- a/include/asm-arm/arch-at91/board.h
++++ b/include/asm-arm/arch-at91/board.h
 @@ -36,6 +36,7 @@
  #include <linux/i2c.h>
  #include <linux/leds.h>
@@ -12682,9 +12576,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/board.h linux-2.6/includ
   /* LEDs */
  extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
  extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/cpu.h linux-2.6/include/asm-arm/arch-at91/cpu.h
---- linux-2.6.25/include/asm-arm/arch-at91/cpu.h       2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/cpu.h  2008-05-05 22:10:58.000000000 +0200
+--- a/include/asm-arm/arch-at91/cpu.h
++++ b/include/asm-arm/arch-at91/cpu.h
 @@ -48,6 +48,17 @@
        return (at91_sys_read(AT91_DBGU_CIDR) & AT91_CIDR_ARCH);
  }
@@ -12716,9 +12609,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/cpu.h linux-2.6/include/
  #endif
  
  /*
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/ics1523.h linux-2.6/include/asm-arm/arch-at91/ics1523.h
---- linux-2.6.25/include/asm-arm/arch-at91/ics1523.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/ics1523.h      2008-01-16 21:24:29.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/ics1523.h
 @@ -0,0 +1,154 @@
 +//*----------------------------------------------------------------------------
 +//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
@@ -12874,9 +12766,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/ics1523.h linux-2.6/incl
 +int at91_ics1523_init(void);
 +
 +#endif /* ics1523_h */
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/spi.h linux-2.6/include/asm-arm/arch-at91/spi.h
---- linux-2.6.25/include/asm-arm/arch-at91/spi.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/spi.h  2008-01-16 21:24:29.000000000 +0200
+--- /dev/null
++++ b/include/asm-arm/arch-at91/spi.h
 @@ -0,0 +1,54 @@
 +/*
 + * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
@@ -12932,9 +12823,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/spi.h linux-2.6/include/
 +extern int spi_transfer(struct spi_transfer_list* list);
 +
 +#endif
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/timex.h linux-2.6/include/asm-arm/arch-at91/timex.h
---- linux-2.6.25/include/asm-arm/arch-at91/timex.h     2008-05-03 00:15:51.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-at91/timex.h        2008-04-18 18:30:40.000000000 +0200
+--- a/include/asm-arm/arch-at91/timex.h
++++ b/include/asm-arm/arch-at91/timex.h
 @@ -27,14 +27,29 @@
  
  #define CLOCK_TICK_RATE               (AT91_SLOW_CLOCK)
@@ -12966,9 +12856,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-at91/timex.h linux-2.6/includ
  #define CLOCK_TICK_RATE               (AT91SAM9_MASTER_CLOCK/16)
  
  #elif defined(CONFIG_ARCH_AT91SAM9RL)
-diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-ks8695/devices.h linux-2.6/include/asm-arm/arch-ks8695/devices.h
---- linux-2.6.25/include/asm-arm/arch-ks8695/devices.h 2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/asm-arm/arch-ks8695/devices.h    2007-12-31 10:44:34.000000000 +0200
+--- a/include/asm-arm/arch-ks8695/devices.h
++++ b/include/asm-arm/arch-ks8695/devices.h
 @@ -18,6 +18,11 @@
  extern void __init ks8695_add_device_lan(void);
  extern void __init ks8695_add_device_hpna(void);
@@ -12981,9 +12870,8 @@ diff -urN -x CVS linux-2.6.25/include/asm-arm/arch-ks8695/devices.h linux-2.6/in
   /* PCI */
  #define KS8695_MODE_PCI               0
  #define KS8695_MODE_MINIPCI   1
-diff -urN -x CVS linux-2.6.25/include/linux/clk.h linux-2.6/include/linux/clk.h
---- linux-2.6.25/include/linux/clk.h   2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6/include/linux/clk.h      2007-12-31 10:44:34.000000000 +0200
+--- a/include/linux/clk.h
++++ b/include/linux/clk.h
 @@ -121,4 +121,24 @@
   */
  struct clk *clk_get_parent(struct clk *clk);
@@ -13009,9 +12897,8 @@ diff -urN -x CVS linux-2.6.25/include/linux/clk.h linux-2.6/include/linux/clk.h
 +int clk_must_disable(struct clk *clk);
 +
  #endif
-diff -urN -x CVS linux-2.6.25/include/linux/i2c-id.h linux-2.6/include/linux/i2c-id.h
---- linux-2.6.25/include/linux/i2c-id.h        2008-05-03 00:15:52.000000000 +0200
-+++ linux-2.6/include/linux/i2c-id.h   2008-03-09 15:43:48.000000000 +0200
+--- a/include/linux/i2c-id.h
++++ b/include/linux/i2c-id.h
 @@ -131,6 +131,7 @@
  
  /* --- PCA 9564 based algorithms */
@@ -13020,9 +12907,8 @@ diff -urN -x CVS linux-2.6.25/include/linux/i2c-id.h linux-2.6/include/linux/i2c
  
  /* --- PowerPC on-chip adapters                                               */
  #define I2C_HW_OCP            0x120000 /* IBM on-chip I2C adapter */
-diff -urN -x CVS linux-2.6.25/include/linux/usb/atmel_usba_udc.h linux-2.6/include/linux/usb/atmel_usba_udc.h
---- linux-2.6.25/include/linux/usb/atmel_usba_udc.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6/include/linux/usb/atmel_usba_udc.h       2008-05-03 00:31:09.000000000 +0200
+--- /dev/null
++++ b/include/linux/usb/atmel_usba_udc.h
 @@ -0,0 +1,23 @@
 +/*
 +* Platform data definitions for Atmel USBA gadget driver.
@@ -13047,9 +12933,8 @@ diff -urN -x CVS linux-2.6.25/include/linux/usb/atmel_usba_udc.h linux-2.6/inclu
 +
 +#endif /* __LINUX_USB_USBA_H */
 +
-diff -urN -x CVS linux-2.6.25/include/video/atmel_lcdc.h linux-2.6/include/video/atmel_lcdc.h
---- linux-2.6.25/include/video/atmel_lcdc.h    2008-05-03 00:15:53.000000000 +0200
-+++ linux-2.6/include/video/atmel_lcdc.h       2008-03-09 15:53:40.000000000 +0200
+--- a/include/video/atmel_lcdc.h
++++ b/include/video/atmel_lcdc.h
 @@ -39,6 +39,7 @@
        u8                      bl_power;
  #endif
@@ -13058,9 +12943,8 @@ diff -urN -x CVS linux-2.6.25/include/video/atmel_lcdc.h linux-2.6/include/video
  
        u8                      default_bpp;
        unsigned int            default_lcdcon2;
-diff -urN -x CVS linux-2.6.25/sound/soc/at91/eti_b1_wm8731.c linux-2.6/sound/soc/at91/eti_b1_wm8731.c
---- linux-2.6.25/sound/soc/at91/eti_b1_wm8731.c        2008-05-03 00:15:56.000000000 +0200
-+++ linux-2.6/sound/soc/at91/eti_b1_wm8731.c   2008-03-09 15:15:07.000000000 +0200
+--- a/sound/soc/at91/eti_b1_wm8731.c
++++ b/sound/soc/at91/eti_b1_wm8731.c
 @@ -33,8 +33,7 @@
  #include <sound/soc.h>
  #include <sound/soc-dapm.h>
@@ -13119,9 +13003,8 @@ diff -urN -x CVS linux-2.6.25/sound/soc/at91/eti_b1_wm8731.c linux-2.6/sound/soc
  
        /*
         * Set PCK1 parent to PLLB and its rate to 12 Mhz.
-diff -urN -x CVS linux-2.6.25/sound/spi/at73c213.c linux-2.6/sound/spi/at73c213.c
---- linux-2.6.25/sound/spi/at73c213.c  2008-05-03 00:15:56.000000000 +0200
-+++ linux-2.6/sound/spi/at73c213.c     2008-03-09 15:15:07.000000000 +0200
+--- a/sound/spi/at73c213.c
++++ b/sound/spi/at73c213.c
 @@ -114,7 +114,11 @@
  static struct snd_pcm_hardware snd_at73c213_playback_hw = {
        .info           = SNDRV_PCM_INFO_INTERLEAVED |
index 9f5673b..ee23cc8 100644 (file)
@@ -1,5 +1,5 @@
---- linux-2.6.25.10.n/arch/arm/mach-at91/Kconfig       2008-07-04 13:07:01.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/Kconfig 2008-07-03 13:44:35.000000000 +0200
+--- a/arch/arm/mach-at91/Kconfig
++++ b/arch/arm/mach-at91/Kconfig
 @@ -151,6 +151,12 @@
        help
          Select this if you are using Toptech's TT9200 board.
@@ -13,8 +13,8 @@
  endif
  
  # ----------------------------------------------------------
---- linux-2.6.25.10.n/arch/arm/mach-at91/Makefile      2008-07-04 13:05:05.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/Makefile        2008-07-03 13:44:35.000000000 +0200
+--- a/arch/arm/mach-at91/Makefile
++++ b/arch/arm/mach-at91/Makefile
 @@ -29,6 +29,7 @@
  obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
  obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
@@ -23,8 +23,8 @@
  obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
  obj-$(CONFIG_MACH_HOMEMATIC)  += board-homematic.o
  obj-$(CONFIG_MACH_ECBAT91)    += board-ecbat91.o
---- linux-2.6.25.10.n/arch/arm/mach-at91/board-vlink.c 2008-07-04 13:06:19.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c   2008-07-04 12:45:48.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/board-vlink.c
 @@ -0,0 +1,201 @@
 +/*
 + * linux/arch/arm/mach-at91/board-vlink.c
index 8c08c89..20e1fe7 100644 (file)
@@ -1,6 +1,5 @@
-diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c
---- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c        2008-07-06 09:01:53.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c    2008-07-06 09:47:54.000000000 +0200
+--- a/arch/arm/mach-at91/at91rm9200_devices.c
++++ b/arch/arm/mach-at91/at91rm9200_devices.c
 @@ -717,6 +717,26 @@
  static void __init at91_add_device_watchdog(void) {}
  #endif
@@ -28,9 +27,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.
  
  /* --------------------------------------------------------------------
   *  SSC -- Synchronous Serial Controller
-diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/Makefile linux-2.6.25.10/arch/arm/mach-at91/Makefile
---- linux-2.6.25.10.old/arch/arm/mach-at91/Makefile    2008-07-06 09:01:54.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/Makefile        2008-07-06 09:45:08.000000000 +0200
+--- a/arch/arm/mach-at91/Makefile
++++ b/arch/arm/mach-at91/Makefile
 @@ -60,7 +60,12 @@
  obj-$(CONFIG_MACH_AT91EB01)   += board-eb01.o
  
@@ -45,9 +43,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/Makefile linux-2.6.25.10/arch/a
  obj-$(CONFIG_FB_S1D13XXX)     += ics1523.o
  
  # Power Management
-diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c linux-2.6.25.10/arch/arm/mach-at91/vlink_leds.c
---- linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.25.10/arch/arm/mach-at91/vlink_leds.c    2008-07-06 09:40:37.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-at91/vlink_leds.c
 @@ -0,0 +1,105 @@
 +/*
 + * LED driver for Atmel AT91-based boards.
@@ -154,9 +151,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c linux-2.6.25.10/ar
 +}
 +
 +__initcall(leds_init);
-diff -urN linux-2.6.25.10.old/include/asm-arm/arch-at91/board.h linux-2.6.25.10/include/asm-arm/arch-at91/board.h
---- linux-2.6.25.10.old/include/asm-arm/arch-at91/board.h      2008-07-06 09:01:54.000000000 +0200
-+++ linux-2.6.25.10/include/asm-arm/arch-at91/board.h  2008-07-06 09:56:31.000000000 +0200
+--- a/include/asm-arm/arch-at91/board.h
++++ b/include/asm-arm/arch-at91/board.h
 @@ -162,6 +162,11 @@
   /* ISI */
  extern void __init at91_add_device_isi(void);
index e81c771..f27b361 100644 (file)
@@ -1,6 +1,5 @@
-diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c
---- linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c       2008-07-07 11:20:21.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c   2008-07-07 12:11:40.000000000 +0200
+--- a/arch/arm/mach-at91/board-vlink.c
++++ b/arch/arm/mach-at91/board-vlink.c
 @@ -99,7 +99,7 @@
  */
  
@@ -103,9 +102,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c linux-2.6.25.10/a
  }
  
  MACHINE_START(VLINK, "FDL VersaLink")
-diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c linux-2.6.25.10/arch/arm/mach-at91/gpio.c
---- linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c      2008-07-07 11:20:21.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/gpio.c  2008-07-07 11:42:33.000000000 +0200
+--- a/arch/arm/mach-at91/gpio.c
++++ b/arch/arm/mach-at91/gpio.c
 @@ -29,6 +29,7 @@
  
  static struct at91_gpio_bank *gpio;
@@ -175,9 +173,8 @@ diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c linux-2.6.25.10/arch/arm
  /*--------------------------------------------------------------------------*/
  
  #ifdef CONFIG_PM
-diff -urN linux-2.6.25.10.old/drivers/char/Kconfig linux-2.6.25.10/drivers/char/Kconfig
---- linux-2.6.25.10.old/drivers/char/Kconfig   2008-07-07 11:20:21.000000000 +0200
-+++ linux-2.6.25.10/drivers/char/Kconfig       2008-07-07 11:42:33.000000000 +0200
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
 @@ -1072,5 +1072,12 @@
          The SPI driver gives user mode access to this serial
          bus on the AT91RM9200 processor.
@@ -191,9 +188,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/Kconfig linux-2.6.25.10/drivers/char/
 +
  endmenu
  
-diff -urN linux-2.6.25.10.old/drivers/char/Makefile linux-2.6.25.10/drivers/char/Makefile
---- linux-2.6.25.10.old/drivers/char/Makefile  2008-07-07 11:20:21.000000000 +0200
-+++ linux-2.6.25.10/drivers/char/Makefile      2008-07-07 11:42:33.000000000 +0200
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
 @@ -100,6 +100,7 @@
  obj-$(CONFIG_TELCLOCK)                += tlclk.o
  obj-$(CONFIG_AT91_SPI)                += at91_spi.o
@@ -202,9 +198,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/Makefile linux-2.6.25.10/drivers/char
  
  obj-$(CONFIG_MWAVE)           += mwave/
  obj-$(CONFIG_AGP)             += agp/
-diff -urN linux-2.6.25.10.old/drivers/char/vlink_giu.c linux-2.6.25.10/drivers/char/vlink_giu.c
---- linux-2.6.25.10.old/drivers/char/vlink_giu.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.25.10/drivers/char/vlink_giu.c   2008-07-07 13:41:51.000000000 +0200
+--- /dev/null
++++ b/drivers/char/vlink_giu.c
 @@ -0,0 +1,333 @@
 +/*
 + *  Driver for FDL Versalink GPIO
@@ -539,9 +534,8 @@ diff -urN linux-2.6.25.10.old/drivers/char/vlink_giu.c linux-2.6.25.10/drivers/c
 +
 +MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>");
 +MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
-+MODULE_LICENSE("GPL");
---- linux-2.6.25.10.old/include/asm-arm/arch-at91/gpio.h       2008-07-03 05:46:47.000000000 +0200
-+++ linux-2.6.25.10/include/asm-arm/arch-at91/gpio.h   2008-07-07 17:03:03.000000000 +0200
+--- a/include/asm-arm/arch-at91/gpio.h
++++ b/include/asm-arm/arch-at91/gpio.h
 @@ -199,6 +199,7 @@
  /* callable at any time */
  extern int at91_set_gpio_value(unsigned pin, int value);
index 5c0cd3e..8060259 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
-===================================================================
---- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c
-+++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
-@@ -175,7 +175,7 @@ static struct mtd_partition static_parti
+--- a/drivers/mtd/devices/at91_dataflash.c
++++ b/drivers/mtd/devices/at91_dataflash.c
+@@ -175,7 +175,7 @@
  };
  #endif
  
@@ -11,13 +9,11 @@ Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
  
  #endif
  
-Index: linux-2.6.22.19/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.22.19.orig/drivers/mtd/Kconfig
-+++ linux-2.6.22.19/drivers/mtd/Kconfig
-@@ -168,6 +168,12 @@ config MTD_AFS_PARTS
-         the partition map from the children of the flash node,
-         as described in Documentation/powerpc/booting-without-of.txt.
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -168,6 +168,12 @@
+         the partition map from the children of the flash node,
+         as described in Documentation/powerpc/booting-without-of.txt.
  
 +config MTD_AT91_PARTS
 +      tristate "Atmel AT91 partitioning support"
@@ -28,11 +24,9 @@ Index: linux-2.6.22.19/drivers/mtd/Kconfig
  comment "User Modules And Translation Layers"
  
  config MTD_CHAR
-Index: linux-2.6.22.19/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.22.19.orig/drivers/mtd/Makefile
-+++ linux-2.6.22.19/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -12,6 +12,7 @@
  obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
index 3cdbec2..3319901 100644 (file)
@@ -1,5 +1,5 @@
---- linux-2.6.25.10.old/drivers/serial/atmel_serial.c  2008-07-04 14:21:12.000000000 +0200
-+++ linux-2.6.25.10/drivers/serial/atmel_serial.c      2008-07-04 14:55:37.000000000 +0200
+--- a/drivers/serial/atmel_serial.c
++++ b/drivers/serial/atmel_serial.c
 @@ -214,6 +214,34 @@
                                at91_set_gpio_value(AT91_PIN_PA21, 0);
                        else
index 64bb3ec..45d6783 100644 (file)
@@ -1,6 +1,6 @@
---- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c        2008-07-04 15:04:13.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c    2008-07-04 15:11:44.000000000 +0200
-@@ -981,7 +981,15 @@
+--- a/arch/arm/mach-at91/at91rm9200_devices.c
++++ b/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -1001,7 +1001,15 @@
                 *  We need to drive the pin manually.  Default is off (RTS is active low).
                 */
                at91_set_gpio_output(AT91_PIN_PA21, 1);
@@ -17,7 +17,7 @@
  }
  
  static struct resource uart1_resources[] = {
-@@ -1119,6 +1127,14 @@
+@@ -1139,6 +1147,14 @@
                at91_set_B_periph(AT91_PIN_PB1, 0);     /* CTS3 */
        if (pins & ATMEL_UART_RTS)
                at91_set_B_periph(AT91_PIN_PB0, 0);     /* RTS3 */
index 120c32e..a848512 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
-===================================================================
---- linux-2.6.22.19.orig/drivers/net/arm/at91_ether.c
-+++ linux-2.6.22.19/drivers/net/arm/at91_ether.c
-@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
+--- a/drivers/net/arm/at91_ether.c
++++ b/drivers/net/arm/at91_ether.c
+@@ -146,6 +146,7 @@
        struct at91_private *lp = netdev_priv(dev);
        unsigned int bmsr, bmcr, lpa, mac_cfg;
        unsigned int speed, duplex;
@@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
  
        if (!mii_link_ok(&lp->mii)) {           /* no link */
                netif_carrier_off(dev);
-@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
+@@ -158,8 +159,15 @@
        read_phy(lp->phy_address, MII_BMSR, &bmsr);
        read_phy(lp->phy_address, MII_BMCR, &bmcr);
        if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
index 1c49db5..4912074 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
-===================================================================
---- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c
-+++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c
-@@ -163,12 +163,12 @@ static struct mtd_partition static_parti
+--- a/drivers/mtd/devices/at91_dataflash.c
++++ b/drivers/mtd/devices/at91_dataflash.c
+@@ -163,12 +163,12 @@
                .mask_flags     = MTD_WRITEABLE,        /* read-only */
        },
        {
index e251ec9..412490f 100644 (file)
@@ -1,5 +1,5 @@
---- linux-2.6.25.10.old/drivers/usb/serial/usb-serial.c        2008-07-08 07:42:24.000000000 +0200
-+++ linux-2.6.25.10/drivers/usb/serial/usb-serial.c    2008-07-08 14:07:39.000000000 +0200
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
 @@ -905,7 +905,7 @@
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
index 8761811..e0228c5 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=au1000
 BOARDNAME:=RMI/AMD AU1x00
 FEATURES:=jffs2 usb pci
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += yamonenv
index 650d493..a9af238 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=avr32
 BOARD:=avr32
 BOARDNAME:=Atmel AVR32
 FEATURES:=squashfs
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index f1e1cf7..2f6291a 100644 (file)
 +obj-$(CONFIG_MMC_ATMELMCI)    += atmel-mci.o
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
+ obj-$(CONFIG_GPIOMMC)         += gpiommc.o
 --- /dev/null
 +++ b/drivers/mmc/host/atmel-mci.c
 @@ -0,0 +1,1234 @@
 +#endif
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1691,6 +1691,8 @@
+@@ -1692,6 +1692,8 @@
  extern int invalidate_inode_pages2(struct address_space *mapping);
  extern int invalidate_inode_pages2_range(struct address_space *mapping,
                                         pgoff_t start, pgoff_t end);
index f668463..246c59a 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-switch kmod-diag
index 6dcc34b..5f5e480 100644 (file)
@@ -6,11 +6,9 @@ the PCI core, if our host-bus is not PCI.
 Reported-by: Steve Brown <sbrown@cortland.com>
 Signed-off-by: Michael Buesch <mb@bu3sch.de>
 
-Index: wireless-testing/drivers/ssb/driver_pcicore.c
-===================================================================
---- wireless-testing.orig/drivers/ssb/driver_pcicore.c 2008-06-10 13:58:23.000000000 +0200
-+++ wireless-testing/drivers/ssb/driver_pcicore.c      2008-07-04 23:16:02.000000000 +0200
-@@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -519,6 +519,13 @@
        int err = 0;
        u32 tmp;
  
index 4cb7642..59552ed 100644 (file)
@@ -1,9 +1,7 @@
 Add gpio_is_valid() for bcm47xx
-Index: linux-2.6.25.10/arch/mips/bcm47xx/gpio.c
-===================================================================
---- linux-2.6.25.10.orig/arch/mips/bcm47xx/gpio.c      2008-07-20 20:48:44.000000000 +0200
-+++ linux-2.6.25.10/arch/mips/bcm47xx/gpio.c   2008-07-20 20:57:55.000000000 +0200
-@@ -77,3 +77,15 @@ int bcm47xx_gpio_direction_output(unsign
+--- a/arch/mips/bcm47xx/gpio.c
++++ b/arch/mips/bcm47xx/gpio.c
+@@ -77,3 +77,15 @@
  }
  EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);
  
@@ -19,11 +17,9 @@ Index: linux-2.6.25.10/arch/mips/bcm47xx/gpio.c
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(bcm47xx_gpio_is_valid);
-Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h
-===================================================================
---- linux-2.6.25.10.orig/include/asm-mips/mach-bcm47xx/gpio.h  2008-07-20 20:48:44.000000000 +0200
-+++ linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h       2008-07-20 20:49:20.000000000 +0200
-@@ -17,6 +17,7 @@ extern int bcm47xx_gpio_get_value(unsign
+--- a/include/asm-mips/mach-bcm47xx/gpio.h
++++ b/include/asm-mips/mach-bcm47xx/gpio.h
+@@ -17,6 +17,7 @@
  extern void bcm47xx_gpio_set_value(unsigned gpio, int value);
  extern int bcm47xx_gpio_direction_input(unsigned gpio);
  extern int bcm47xx_gpio_direction_output(unsigned gpio, int value);
@@ -31,7 +27,7 @@ Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h
  
  static inline int gpio_request(unsigned gpio, const char *label)
  {
-@@ -52,6 +53,8 @@ static inline int gpio_direction_output(
+@@ -52,6 +53,8 @@
        return bcm47xx_gpio_direction_output(gpio, value);
  }
  
index b4b0fb8..e232b00 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=brcm63xx
 BOARDNAME:=Broadcom BCM963xx
 FEATURES:=squashfs jffs2 broken usb atm
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index 9c125b0..abe5653 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=cris
 BOARD:=etrax
 BOARDNAME:=Foxboard (ETRAX 100LX)
 FEATURES:=squashfs jffs2 broken
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 
index 917adc5..c530519 100644 (file)
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -210,6 +210,14 @@
+@@ -208,6 +208,14 @@
         * too. */
        nf_ct_remove_expectations(ct);
  
index 5f35f00..355cfb2 100644 (file)
@@ -1,7 +1,6 @@
-diff -Nur a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
---- a/drivers/mtd/devices/m25p80.c     2008-07-06 14:36:59.000000000 +0200
-+++ b/drivers/mtd/devices/m25p80.c     2008-07-06 15:17:48.000000000 +0200
-@@ -631,12 +631,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -627,12 +627,10 @@
                struct mtd_partition    *parts = NULL;
                int                     nr_parts = 0;
  
index 1249a63..4608a22 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.10/include/linux/spi/spi_gpio.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/include/linux/spi/spi_gpio.h       2008-07-20 20:10:21.000000000 +0200
+--- /dev/null
++++ b/include/linux/spi/spi_gpio.h
 @@ -0,0 +1,73 @@
 +/*
 + * spi_gpio interface to platform code
@@ -76,10 +74,8 @@ Index: linux-2.6.25.10/include/linux/spi/spi_gpio.h
 +int spi_gpio_next_id(void);
 +
 +#endif /* _LINUX_SPI_SPI_GPIO */
-Index: linux-2.6.25.10/drivers/spi/spi_gpio.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/drivers/spi/spi_gpio.c     2008-07-20 20:10:21.000000000 +0200
+--- /dev/null
++++ b/drivers/spi/spi_gpio.c
 @@ -0,0 +1,251 @@
 +/*
 + * Bitbanging SPI bus driver using GPIO API
@@ -332,11 +328,9 @@ Index: linux-2.6.25.10/drivers/spi/spi_gpio.c
 +MODULE_AUTHOR("Michael Buesch");
 +MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
 +MODULE_LICENSE("GPL v2");
-Index: linux-2.6.25.10/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.25.10.orig/drivers/spi/Kconfig   2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/drivers/spi/Kconfig        2008-07-20 20:11:48.000000000 +0200
-@@ -100,6 +100,19 @@ config SPI_BUTTERFLY
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -100,6 +100,19 @@
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  
@@ -356,11 +350,9 @@ Index: linux-2.6.25.10/drivers/spi/Kconfig
  config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.25.10/drivers/spi/Makefile
-===================================================================
---- linux-2.6.25.10.orig/drivers/spi/Makefile  2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/drivers/spi/Makefile       2008-07-20 20:10:21.000000000 +0200
-@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -16,6 +16,7 @@
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
  obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
@@ -368,11 +360,9 @@ Index: linux-2.6.25.10/drivers/spi/Makefile
  obj-$(CONFIG_SPI_IMX)                 += spi_imx.o
  obj-$(CONFIG_SPI_LM70_LLP)            += spi_lm70llp.o
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
-Index: linux-2.6.25.10/MAINTAINERS
-===================================================================
---- linux-2.6.25.10.orig/MAINTAINERS   2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/MAINTAINERS        2008-07-20 20:10:59.000000000 +0200
-@@ -3685,6 +3685,11 @@ M:      dbrownell@users.sourceforge.net
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3685,6 +3685,11 @@
  L:    spi-devel-general@lists.sourceforge.net
  S:    Maintained
  
index 8bb4c99..326e6bf 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/drivers/mmc/host/gpiommc.c 2008-07-20 20:49:16.000000000 +0200
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
 @@ -0,0 +1,608 @@
 +/*
 + * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
@@ -611,11 +609,9 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
 +      platform_driver_unregister(&gpiommc_plat_driver);
 +}
 +module_exit(gpiommc_modexit);
-Index: linux-2.6.25.10/drivers/mmc/host/Kconfig
-===================================================================
---- linux-2.6.25.10.orig/drivers/mmc/host/Kconfig      2008-07-20 20:32:22.000000000 +0200
-+++ linux-2.6.25.10/drivers/mmc/host/Kconfig   2008-07-20 20:33:20.000000000 +0200
-@@ -130,3 +130,27 @@ config MMC_SPI
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -130,3 +130,27 @@
  
          If unsure, or if your system has no SPI master driver, say N.
  
@@ -643,20 +639,16 @@ Index: linux-2.6.25.10/drivers/mmc/host/Kconfig
 +      help
 +        This option automatically enables configfs support for gpiommc
 +        if configfs is available.
-Index: linux-2.6.25.10/drivers/mmc/host/Makefile
-===================================================================
---- linux-2.6.25.10.orig/drivers/mmc/host/Makefile     2008-07-20 20:32:22.000000000 +0200
-+++ linux-2.6.25.10/drivers/mmc/host/Makefile  2008-07-20 20:33:20.000000000 +0200
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -17,4 +17,4 @@
  obj-$(CONFIG_MMC_AT91)                += at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
 -
 +obj-$(CONFIG_GPIOMMC)         += gpiommc.o
-Index: linux-2.6.25.10/include/linux/mmc/gpiommc.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/include/linux/mmc/gpiommc.h        2008-07-20 20:33:20.000000000 +0200
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
 @@ -0,0 +1,71 @@
 +/*
 + * Device driver for MMC/SD cards driven over a GPIO bus.
@@ -729,10 +721,8 @@ Index: linux-2.6.25.10/include/linux/mmc/gpiommc.h
 +int gpiommc_next_id(void);
 +
 +#endif /* LINUX_GPIOMMC_H_ */
-Index: linux-2.6.25.10/Documentation/gpiommc.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/Documentation/gpiommc.txt  2008-07-20 20:33:20.000000000 +0200
+--- /dev/null
++++ b/Documentation/gpiommc.txt
 @@ -0,0 +1,97 @@
 +GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
 +================================================================
@@ -831,11 +821,9 @@ Index: linux-2.6.25.10/Documentation/gpiommc.txt
 +(/config/gpiommc/my_mmc in this example).
 +There's no need to first unregister the device before removing it. That will
 +be done automatically.
-Index: linux-2.6.25.10/MAINTAINERS
-===================================================================
---- linux-2.6.25.10.orig/MAINTAINERS   2008-07-20 20:33:20.000000000 +0200
-+++ linux-2.6.25.10/MAINTAINERS        2008-07-20 20:33:20.000000000 +0200
-@@ -1736,6 +1736,11 @@ L:      gigaset307x-common@lists.sourceforge.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1736,6 +1736,11 @@
  W:    http://gigaset307x.sourceforge.net/
  S:    Maintained
  
index 79a4acb..1d0f5ba 100644 (file)
@@ -1,11 +1,9 @@
 The gpiommc configfs context structure needs locking, as configfs
 does not lock access between files.
 
-Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
-===================================================================
---- linux-2.6.25.10.orig/drivers/mmc/host/gpiommc.c    2008-07-21 11:57:01.000000000 +0200
-+++ linux-2.6.25.10/drivers/mmc/host/gpiommc.c 2008-07-21 12:01:33.000000000 +0200
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -143,6 +143,8 @@
        struct platform_device *pdev;
        /* The configuration */
        struct gpiommc_platform_data pdata;
@@ -14,7 +12,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  };
  
  #define GPIO_INVALID  -1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
+@@ -233,6 +235,8 @@
        unsigned int gpio;
        int err = 0;
  
@@ -23,7 +21,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
        if (attr == &gpiommc_attr_DI) {
                gpio = dev->pdata.pins.gpio_di;
                if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
+@@ -293,6 +297,8 @@
        WARN_ON(1);
        err = -ENOSYS;
  out:
@@ -32,7 +30,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
        return err ? err : count;
  }
  
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -352,6 +358,8 @@
        int err = -EINVAL;
        unsigned long data;
  
@@ -41,7 +39,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
        if (attr == &gpiommc_attr_register) {
                err = strict_strtoul(page, 10, &data);
                if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -477,6 +485,8 @@
        WARN_ON(1);
        err = -ENOSYS;
  out:
@@ -50,7 +48,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
        return err ? err : count;
  }
  
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
+@@ -513,6 +523,7 @@
        if (!dev)
                return NULL;
  
index 59a84c2..81789b8 100644 (file)
@@ -1,25 +1,15 @@
-Index: linux-2.6.x/crypto/Kconfig
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/crypto/Kconfig,v
-retrieving revision 1.1.1.29
-diff -u -r1.1.1.29 Kconfig
---- linux-2.6.x/crypto/Kconfig 10 Oct 2007 00:54:29 -0000      1.1.1.29
-+++ linux-2.6.x/crypto/Kconfig 15 Dec 2007 11:08:08 -0000
-@@ -471,3 +471,6 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -593,3 +593,6 @@
  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO
 +
 +source "crypto/ocf/Kconfig"
 +
-Index: linux-2.6.x/crypto/Makefile
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/crypto/Makefile,v
-retrieving revision 1.1.1.23
-diff -u -r1.1.1.23 Makefile
---- linux-2.6.x/crypto/Makefile        10 Oct 2007 00:54:29 -0000      1.1.1.23
-+++ linux-2.6.x/crypto/Makefile        15 Dec 2007 11:08:08 -0000
-@@ -51,6 +51,8 @@
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -65,6 +65,8 @@
  
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  
@@ -28,14 +18,8 @@ diff -u -r1.1.1.23 Makefile
  #
  # generic algorithms and the async_tx api
  #
-Index: linux-2.6.x/drivers/char/random.c
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/drivers/char/random.c,v
-retrieving revision 1.1.1.41
-retrieving revision 1.6
-diff -u -r1.1.1.41 -r1.6
---- linux-2.6.x/drivers/char/random.c  22 Apr 2008 01:36:57 -0000      1.1.1.41
-+++ linux-2.6.x/drivers/char/random.c  22 Apr 2008 04:48:56 -0000      1.6
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
 @@ -129,6 +129,9 @@
   *                                unsigned int value);
   *    void add_interrupt_randomness(int irq);
@@ -122,14 +106,8 @@ diff -u -r1.1.1.41 -r1.6
  #define EXTRACT_SIZE 10
  
  /*********************************************************************
-Index: linux-2.6.x/fs/fcntl.c
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/fs/fcntl.c,v
-retrieving revision 1.1.1.39
-retrieving revision 1.5
-diff -u -r1.1.1.39 -r1.5
---- linux-2.6.x/fs/fcntl.c     22 Apr 2008 01:37:55 -0000      1.1.1.39
-+++ linux-2.6.x/fs/fcntl.c     22 Apr 2008 04:49:02 -0000      1.5
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
 @@ -202,6 +202,7 @@
                ret = dupfd(file, 0, 0);
        return ret;
@@ -138,14 +116,8 @@ diff -u -r1.1.1.39 -r1.5
  
  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT | O_NOATIME)
  
-Index: linux-2.6.x/include/linux/miscdevice.h
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/include/linux/miscdevice.h,v
-retrieving revision 1.1.1.16
-retrieving revision 1.8
-diff -u -r1.1.1.16 -r1.8
---- linux-2.6.x/include/linux/miscdevice.h     22 Apr 2008 01:36:52 -0000      1.1.1.16
-+++ linux-2.6.x/include/linux/miscdevice.h     22 Apr 2008 04:49:10 -0000      1.8
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
 @@ -12,6 +12,7 @@
  #define APOLLO_MOUSE_MINOR 7
  #define PC110PAD_MINOR 9
@@ -154,14 +126,8 @@ diff -u -r1.1.1.16 -r1.8
  #define WATCHDOG_MINOR                130     /* Watchdog timer     */
  #define TEMP_MINOR            131     /* Temperature Sensor */
  #define RTC_MINOR 135
-Index: linux-2.6.x/include/linux/random.h
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/include/linux/random.h,v
-retrieving revision 1.1.1.12
-retrieving revision 1.5
-diff -u -r1.1.1.12 -r1.5
---- linux-2.6.x/include/linux/random.h 26 Apr 2007 11:16:52 -0000      1.1.1.12
-+++ linux-2.6.x/include/linux/random.h 22 May 2008 03:31:38 -0000      1.5
+--- a/include/linux/random.h
++++ b/include/linux/random.h
 @@ -8,6 +8,7 @@
  #define _LINUX_RANDOM_H
  
@@ -212,8 +178,8 @@ diff -u -r1.1.1.12 -r1.5
  extern void get_random_bytes(void *buf, int nbytes);
  void generate_random_uuid(unsigned char uuid_out[16]);
  
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/Makefile     2007-07-25 11:02:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/Makefile
 @@ -0,0 +1,13 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -228,8 +194,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/Makefile     2007-07-25 11:02:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/Makefile
 @@ -0,0 +1,12 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -243,8 +209,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/Makefile  2008-07-04 14:48:17.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/Makefile
 @@ -0,0 +1,120 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -366,8 +332,8 @@ diff -u -r1.1.1.12 -r1.5
 +                                      crypto-tools; \
 +              gzip -9 /tmp/crypto-tools-$$REL.tar
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/talitos/Makefile  2007-07-25 11:02:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/talitos/Makefile
 @@ -0,0 +1,12 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -381,8 +347,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ixp4xx/Makefile   2007-10-19 11:24:59.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ixp4xx/Makefile
 @@ -0,0 +1,104 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -488,8 +454,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ocfnull/Makefile  2007-07-25 11:02:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ocfnull/Makefile
 @@ -0,0 +1,12 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -503,8 +469,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/pasemi/Makefile   2007-12-12 11:36:18.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/pasemi/Makefile
 @@ -0,0 +1,12 @@
 +# for SGlinux builds
 +-include $(ROOTDIR)/modules/.config
@@ -518,8 +484,8 @@ diff -u -r1.1.1.12 -r1.5
 +-include $(TOPDIR)/Rules.make
 +endif
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/Config.in 2008-06-23 10:09:55.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/Config.in
 @@ -0,0 +1,32 @@
 +#############################################################################
 +
@@ -553,8 +519,8 @@ diff -u -r1.1.1.12 -r1.5
 +endmenu
 +
 +#############################################################################
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/Kconfig   2008-06-23 10:10:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/Kconfig
 @@ -0,0 +1,95 @@
 +menu "OCF Configuration"
 +
@@ -651,8 +617,8 @@ diff -u -r1.1.1.12 -r1.5
 +        for comparison.
 +
 +endmenu
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/README    2007-12-15 21:31:03.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/README
 @@ -0,0 +1,166 @@
 +README - ocf-linux-20071215
 +---------------------------
@@ -820,8 +786,8 @@ diff -u -r1.1.1.12 -r1.5
 +
 +David McCullough
 +david_mccullough@securecomputing.com
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifn7751reg.h        2007-06-20 09:15:58.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifn7751reg.h
 @@ -0,0 +1,540 @@
 +/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.7 2007/03/21 03:42:49 sam Exp $ */
 +/*    $OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $  */
@@ -1363,8 +1329,8 @@ diff -u -r1.1.1.12 -r1.5
 +#define       HIFN_MAX_SEGLEN         0xffff          /* maximum dma segment len */
 +#define       HIFN_MAX_DMALEN         0x3ffff         /* maximum dma length */
 +#endif /* __HIFN_H__ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifn7751var.h        2007-06-20 09:22:39.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifn7751var.h
 @@ -0,0 +1,369 @@
 +/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.9 2007/03/21 03:42:49 sam Exp $ */
 +/*    $OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $  */
@@ -1735,8 +1701,8 @@ diff -u -r1.1.1.12 -r1.5
 +};
 +
 +#endif /* __HIFN7751VAR_H__ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifn7751.c   2008-02-14 14:59:01.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifn7751.c
 @@ -0,0 +1,2970 @@
 +/*    $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $  */
 +
@@ -4708,8 +4674,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("OCF driver for hifn PCI crypto devices");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifnHIPP.c   2007-07-25 14:36:45.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifnHIPP.c
 @@ -0,0 +1,420 @@
 +/*-
 + * Driver for Hifn HIPP-I/II chipset
@@ -5131,8 +5097,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("Michael Richardson <mcr@xelerance.com>");
 +MODULE_DESCRIPTION("OCF driver for hifn HIPP-I/II PCI crypto devices");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifnHIPPreg.h        2007-07-25 10:11:22.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifnHIPPreg.h
 @@ -0,0 +1,46 @@
 +/*-
 + * Hifn HIPP-I/HIPP-II (7855/8155) driver.
@@ -5180,8 +5146,8 @@ diff -u -r1.1.1.12 -r1.5
 +#define HIPP_1_REVID            0x01 /* BOGUS */
 +
 +#endif /* __HIPP_H__ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/hifn/hifnHIPPvar.h        2007-07-25 13:47:04.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/hifn/hifnHIPPvar.h
 @@ -0,0 +1,93 @@
 +/*
 + * Hifn HIPP-I/HIPP-II (7855/8155) driver.
@@ -5276,8 +5242,8 @@ diff -u -r1.1.1.12 -r1.5
 +#define       HIPP_UNLOCK(_sc)        spin_unlock_irqrestore(&(_sc)->sc_mtx, l_flags)
 +
 +#endif /* __HIFNHIPPVAR_H__ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/md5.c        2005-05-20 10:30:52.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/md5.c
 @@ -0,0 +1,308 @@
 +/*    $KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $     */
 +/*
@@ -5587,8 +5553,8 @@ diff -u -r1.1.1.12 -r1.5
 +      ctxt->md5_stc += C;
 +      ctxt->md5_std += D;
 +}
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/md5.h        2005-05-20 10:30:52.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/md5.h
 @@ -0,0 +1,76 @@
 +/*    $FreeBSD: src/sys/crypto/md5.h,v 1.4 2002/03/20 05:13:50 alfred Exp $   */
 +/*    $KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $   */
@@ -5666,8 +5632,8 @@ diff -u -r1.1.1.12 -r1.5
 +} while (0)
 +
 +#endif /* ! _NETINET6_MD5_H_*/
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/safe.c       2007-07-27 11:34:59.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/safe.c
 @@ -0,0 +1,2288 @@
 +/*-
 + * Linux port done by David McCullough <david_mccullough@securecomputing.com>
@@ -7957,8 +7923,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("OCF driver for safenet PCI crypto devices");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/sha1.c       2005-05-20 10:30:53.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/sha1.c
 @@ -0,0 +1,279 @@
 +/*    $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $    */
 +/*
@@ -8239,8 +8205,8 @@ diff -u -r1.1.1.12 -r1.5
 +}
 +
 +#endif /*unsupported*/
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/sha1.h       2005-05-20 10:30:53.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/sha1.h
 @@ -0,0 +1,72 @@
 +/*    $FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $  */
 +/*    $KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $  */
@@ -8314,8 +8280,8 @@ diff -u -r1.1.1.12 -r1.5
 +#define       SHA1_RESULTLEN  (160/8)
 +
 +#endif /*_NETINET6_SHA1_H_*/
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/safereg.h    2005-03-16 15:19:57.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/safereg.h
 @@ -0,0 +1,421 @@
 +/*-
 + * Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -8738,8 +8704,8 @@ diff -u -r1.1.1.12 -r1.5
 +      u_int32_t       sa_saved_indigest[5];   /* saved inner digest */
 +};
 +#endif /* _SAFE_SAFEREG_H_ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/safe/safevar.h    2007-07-03 09:46:58.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/safe/safevar.h
 @@ -0,0 +1,230 @@
 +/*-
 + * The linux port of this code done by David McCullough
@@ -8971,8 +8937,8 @@ diff -u -r1.1.1.12 -r1.5
 +      u_int32_t st_noicvcopy;         /* ICV data copies suppressed */
 +};
 +#endif /* _SAFE_SAFEVAR_H_ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/crypto.c  2008-07-03 10:58:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/crypto.c
 @@ -0,0 +1,1741 @@
 +/*-
 + * Linux port done by David McCullough <david_mccullough@securecomputing.com>
@@ -10715,8 +10681,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("OCF (OpenBSD Cryptographic Framework)");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/criov.c   2007-07-18 13:01:47.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/criov.c
 @@ -0,0 +1,215 @@
 +/*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $       */
 +
@@ -10933,8 +10899,8 @@ diff -u -r1.1.1.12 -r1.5
 +EXPORT_SYMBOL(crypto_copydata);
 +EXPORT_SYMBOL(crypto_apply);
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/uio.h     2007-07-03 09:52:33.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/uio.h
 @@ -0,0 +1,54 @@
 +#ifndef _OCF_UIO_H_
 +#define _OCF_UIO_H_
@@ -10990,8 +10956,8 @@ diff -u -r1.1.1.12 -r1.5
 +};
 +
 +#endif
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/talitos/talitos.c 2008-04-01 15:48:31.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/talitos/talitos.c
 @@ -0,0 +1,1359 @@
 +/*
 + * crypto/ocf/talitos/talitos.c
@@ -12352,8 +12318,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_AUTHOR("kim.phillips@freescale.com");
 +MODULE_DESCRIPTION("OCF driver for Freescale SEC (talitos)");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/talitos/talitos_soft.h    2007-07-20 11:47:16.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/talitos/talitos_soft.h
 @@ -0,0 +1,77 @@
 +/*
 + * Freescale SEC data structures for integration with ocf-linux
@@ -12432,8 +12398,8 @@ diff -u -r1.1.1.12 -r1.5
 +
 +#define       TALITOS_SESSION(sid)    ((sid) & 0x0fffffff)
 +#define       TALITOS_SID(crd, sesn)  (((crd) << 28) | ((sesn) & 0x0fffffff))
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/talitos/talitos_dev.h     2007-11-23 07:31:44.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/talitos/talitos_dev.h
 @@ -0,0 +1,277 @@
 +/*
 + * Freescale SEC (talitos) device dependent data structures
@@ -12712,8 +12678,8 @@ diff -u -r1.1.1.12 -r1.5
 +                                                      printk(a); \
 +                                              } \
 +                                      } while (0)
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/random.c  2007-12-04 13:56:03.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/random.c
 @@ -0,0 +1,317 @@
 +/*
 + * A system independant way of adding entropy to the kernels pool
@@ -13032,8 +12998,8 @@ diff -u -r1.1.1.12 -r1.5
 +      return retval;
 +}
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ocf-bench.c       2007-07-23 22:26:12.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ocf-bench.c
 @@ -0,0 +1,436 @@
 +/*
 + * A loadable module that benchmarks the OCF crypto speed from kernel space.
@@ -13471,8 +13437,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("Benchmark various in-kernel crypto speeds");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ixp4xx/ixp4xx.c   2008-07-03 10:28:05.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ixp4xx/ixp4xx.c
 @@ -0,0 +1,1328 @@
 +/*
 + * An OCF module that uses Intels IXP CryptACC API to do the crypto.
@@ -14802,8 +14768,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_AUTHOR("David McCullough <dmccullough@cyberguard.com>");
 +MODULE_DESCRIPTION("ixp (OCF module for IXP4xx crypto)");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/cryptodev.c       2007-12-14 12:35:04.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/cryptodev.c
 @@ -0,0 +1,1048 @@
 +/*    $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $  */
 +
@@ -15853,8 +15819,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("BSD");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("Cryptodev (user interface to OCF)");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/cryptodev.h       2007-09-26 22:15:05.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/cryptodev.h
 @@ -0,0 +1,478 @@
 +/*    $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $   */
 +/*    $OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $     */
@@ -16334,8 +16300,8 @@ diff -u -r1.1.1.12 -r1.5
 +
 +#endif /* __KERNEL__ */
 +#endif /* _CRYPTO_CRYPTO_H_ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ocfnull/ocfnull.c 2007-07-13 16:02:05.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ocfnull/ocfnull.c
 @@ -0,0 +1,203 @@
 +/*
 + * An OCF module for determining the cost of crypto versus the cost of
@@ -16540,8 +16506,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("ocfnull - claims a lot but does nothing");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/cryptosoft.c      2008-02-14 14:59:01.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/cryptosoft.c
 @@ -0,0 +1,898 @@
 +/*
 + * An OCF module that uses the linux kernel cryptoapi, based on the
@@ -17441,8 +17407,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
 +MODULE_DESCRIPTION("Cryptosoft (OCF module for kernel crypto)");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/rndtest.c 2007-07-20 13:22:03.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/rndtest.c
 @@ -0,0 +1,300 @@
 +/*    $OpenBSD$       */
 +
@@ -17744,8 +17710,8 @@ diff -u -r1.1.1.12 -r1.5
 +      return(rsp.rs_discard);
 +}
 +
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/rndtest.h 2005-05-20 10:28:26.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/rndtest.h
 @@ -0,0 +1,54 @@
 +/*    $FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.1 2003/03/11 22:54:44 sam Exp $     */
 +/*    $OpenBSD$       */
@@ -17801,8 +17767,8 @@ diff -u -r1.1.1.12 -r1.5
 +};
 +
 +extern int rndtest_buf(unsigned char *buf);
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/ocf-compat.h      2008-04-27 09:30:47.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/ocf-compat.h
 @@ -0,0 +1,268 @@
 +#ifndef _BSD_COMPAT_H_
 +#define _BSD_COMPAT_H_ 1
@@ -18072,8 +18038,8 @@ diff -u -r1.1.1.12 -r1.5
 +
 +/****************************************************************************/
 +#endif /* _BSD_COMPAT_H_ */
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/pasemi/pasemi.c   2007-12-12 11:36:18.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/pasemi/pasemi.c
 @@ -0,0 +1,1009 @@
 +/*
 + * Copyright (C) 2007 PA Semi, Inc
@@ -19084,8 +19050,8 @@ diff -u -r1.1.1.12 -r1.5
 +MODULE_LICENSE("Dual BSD/GPL");
 +MODULE_AUTHOR("Egor Martovetsky egor@pasemi.com");
 +MODULE_DESCRIPTION("OCF driver for PA Semi PWRficient DMA Crypto Engine");
---- /dev/null  2007-07-04 13:54:27.000000000 +1000
-+++ linux/crypto/ocf/pasemi/pasemi_fnu.h       2007-12-12 11:36:18.000000000 +1000
+--- /dev/null
++++ b/crypto/ocf/pasemi/pasemi_fnu.h
 @@ -0,0 +1,410 @@
 +/*
 + * Copyright (C) 2007 PA Semi, Inc
index 6148490..578558d 100644 (file)
@@ -1,6 +1,5 @@
-diff -Nru linux-2.6.25.10-old/crypto/ocf/cryptosoft.c linux-2.6.25.10/crypto/ocf/cryptosoft.c
---- linux-2.6.25.10-old/crypto/ocf/cryptosoft.c        2008-07-08 23:38:58.114980680 +0200
-+++ linux-2.6.25.10/crypto/ocf/cryptosoft.c    2008-07-08 23:31:15.866980267 +0200
+--- a/crypto/ocf/cryptosoft.c
++++ b/crypto/ocf/cryptosoft.c
 @@ -48,6 +48,7 @@
  #include <linux/skbuff.h>
  #include <linux/random.h>
index a6822fc..f41b014 100644 (file)
@@ -22,11 +22,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index d8db2f8..eb75d12 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct gpio_desc *desc)
+@@ -68,6 +68,9 @@
        if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
                pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
                desc_set_label(desc, "[auto]");
@@ -36,7 +34,7 @@ index d8db2f8..eb75d12 100644
        }
  }
  
-@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -177,6 +180,9 @@
        if (desc->chip == NULL)
                goto done;
  
@@ -46,7 +44,7 @@ index d8db2f8..eb75d12 100644
        /* NOTE:  gpio_request() can be called in early boot,
         * before IRQs are enabled.
         */
-@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -184,8 +190,10 @@
        if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
                desc_set_label(desc, label ? : "?");
                status = 0;
@@ -58,7 +56,7 @@ index d8db2f8..eb75d12 100644
  
  done:
        if (status)
-@@ -209,9 +217,10 @@ void gpio_free(unsigned gpio)
+@@ -209,9 +217,10 @@
        spin_lock_irqsave(&gpio_lock, flags);
  
        desc = &gpio_desc[gpio];
@@ -71,8 +69,6 @@ index d8db2f8..eb75d12 100644
                WARN_ON(extra_checks);
  
        spin_unlock_irqrestore(&gpio_lock, flags);
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index f29a502..7e77b6f 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
 @@ -17,6 +17,7 @@
@@ -83,7 +79,7 @@ index f29a502..7e77b6f 100644
  
  /**
   * struct gpio_chip - abstract a GPIO controller
-@@ -48,6 +49,7 @@ struct seq_file;
+@@ -48,6 +49,7 @@
   */
  struct gpio_chip {
        char                    *label;
index 58e65ef..49f3808 100644 (file)
@@ -16,11 +16,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
-index 5463009..c35ca9e 100644
 --- a/Documentation/gpio.txt
 +++ b/Documentation/gpio.txt
-@@ -107,6 +107,16 @@ type of GPIO controller, and on one particular board 80-95 with an FPGA.
+@@ -107,6 +107,16 @@
  The numbers need not be contiguous; either of those platforms could also
  use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders.
  
@@ -37,11 +35,9 @@ index 5463009..c35ca9e 100644
  Whether a platform supports multiple GPIO controllers is currently a
  platform-specific implementation issue.
  
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index eb75d12..623fcd9 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
+@@ -99,7 +99,7 @@
         * dynamic allocation.  We don't currently support that.
         */
  
@@ -50,7 +46,7 @@ index eb75d12..623fcd9 100644
                status = -EINVAL;
                goto fail;
        }
-@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -174,7 +174,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -59,7 +55,7 @@ index eb75d12..623fcd9 100644
                goto done;
        desc = &gpio_desc[gpio];
        if (desc->chip == NULL)
-@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
+@@ -209,7 +209,7 @@
        unsigned long           flags;
        struct gpio_desc        *desc;
  
@@ -68,7 +64,7 @@ index eb75d12..623fcd9 100644
                WARN_ON(extra_checks);
                return;
        }
-@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset)
+@@ -245,7 +245,7 @@
  {
        unsigned gpio = chip->base + offset;
  
@@ -77,7 +73,7 @@ index eb75d12..623fcd9 100644
                return NULL;
        if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
                return NULL;
-@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
+@@ -276,7 +276,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -86,7 +82,7 @@ index eb75d12..623fcd9 100644
                goto fail;
        chip = desc->chip;
        if (!chip || !chip->get || !chip->direction_input)
-@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio, int value)
+@@ -314,7 +314,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -95,7 +91,7 @@ index eb75d12..623fcd9 100644
                goto fail;
        chip = desc->chip;
        if (!chip || !chip->set || !chip->direction_output)
-@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file *s, void *unused)
+@@ -531,7 +531,7 @@
  
        /* REVISIT this isn't locked against gpio_chip removal ... */
  
@@ -104,8 +100,6 @@ index eb75d12..623fcd9 100644
                if (chip == gpio_desc[gpio].chip)
                        continue;
                chip = gpio_desc[gpio].chip;
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index 7e77b6f..464c5b3 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
 @@ -16,6 +16,12 @@
@@ -121,7 +115,7 @@ index 7e77b6f..464c5b3 100644
  struct seq_file;
  struct module;
  
-@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio);
+@@ -99,6 +105,16 @@
  
  #else
  
index 0007423..bcd5c19 100644 (file)
@@ -21,11 +21,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 623fcd9..2ba6127 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -80,6 +80,33 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio)
+@@ -80,6 +80,33 @@
        return gpio_desc[gpio].chip;
  }
  
@@ -59,7 +57,7 @@ index 623fcd9..2ba6127 100644
  /**
   * gpiochip_add() - register a gpio_chip
   * @chip: the chip to register, with chip->base initialized
-@@ -88,38 +115,49 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio)
+@@ -88,38 +115,49 @@
   * Returns a negative errno if the chip can't be registered, such as
   * because the chip->base is invalid or already associated with a
   * different chip.  Otherwise it returns zero as a success code.
index 306fb0a..a4a243e 100644 (file)
@@ -19,11 +19,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 2ba6127..24c62b8 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -43,6 +43,7 @@ struct gpio_desc {
+@@ -43,6 +43,7 @@
  /* flag symbols are bit numbers */
  #define FLAG_REQUESTED        0
  #define FLAG_IS_OUT   1
@@ -31,7 +29,7 @@ index 2ba6127..24c62b8 100644
  
  #ifdef CONFIG_DEBUG_FS
        const char              *label;
-@@ -88,9 +89,10 @@ static int gpiochip_find_base(int ngpio)
+@@ -88,9 +89,10 @@
        int base = -ENOSPC;
  
        for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
@@ -44,7 +42,7 @@ index 2ba6127..24c62b8 100644
                        spare++;
                        if (spare == ngpio) {
                                base = i;
-@@ -98,7 +100,8 @@ static int gpiochip_find_base(int ngpio)
+@@ -98,7 +100,8 @@
                        }
                } else {
                        spare = 0;
@@ -54,7 +52,7 @@ index 2ba6127..24c62b8 100644
                }
        }
  
-@@ -108,6 +111,47 @@ static int gpiochip_find_base(int ngpio)
+@@ -108,6 +111,47 @@
  }
  
  /**
@@ -102,11 +100,9 @@ index 2ba6127..24c62b8 100644
   * gpiochip_add() - register a gpio_chip
   * @chip: the chip to register, with chip->base initialized
   * Context: potentially before irqs or kmalloc will work
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index 464c5b3..ecf675a 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
-@@ -74,6 +74,7 @@ struct gpio_chip {
+@@ -74,6 +74,7 @@
  
  extern const char *gpiochip_is_requested(struct gpio_chip *chip,
                        unsigned offset);
index 715f9ab..74d7247 100644 (file)
@@ -15,11 +15,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 7f138c6..beaf6b3 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, int ngpio)
+@@ -127,7 +127,7 @@
        unsigned long flags;
        int i;
  
@@ -28,7 +26,7 @@ index 7f138c6..beaf6b3 100644
                return -EINVAL;
  
        spin_lock_irqsave(&gpio_lock, flags);
-@@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
+@@ -170,7 +170,7 @@
        unsigned        id;
        int             base = chip->base;
  
@@ -37,7 +35,7 @@ index 7f138c6..beaf6b3 100644
                        && base >= 0) {
                status = -EINVAL;
                goto fail;
-@@ -207,7 +207,7 @@ fail:
+@@ -207,7 +207,7 @@
        /* failures here can mean systems won't boot... */
        if (status)
                pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",
index 6df1900..04c620c 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=ifxmips
 BOARDNAME:=Infineon Mips
 FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES:=uboot-ifxmips
index 38c8fd6..0e82af7 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.7/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/Kconfig      2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/Kconfig   2008-06-26 22:05:19.000000000 +0200
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
 @@ -78,6 +78,21 @@
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -32,10 +30,8 @@ Index: linux-2.6.25.7/arch/mips/Kconfig
  
  endmenu
  
-Index: linux-2.6.25.7/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/Makefile     2008-06-26 10:42:55.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/Makefile  2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
 @@ -283,6 +283,13 @@
  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  
@@ -50,10 +46,8 @@ Index: linux-2.6.25.7/arch/mips/Makefile
  # DECstation family
  #
  core-$(CONFIG_MACH_DECSTATION)        += arch/mips/dec/
-Index: linux-2.6.25.7/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h    2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-26 10:42:56.000000000 +0200
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h
 @@ -94,6 +94,12 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */
@@ -67,10 +61,8 @@ Index: linux-2.6.25.7/include/asm-mips/bootinfo.h
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;
-Index: linux-2.6.25.7/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/kernel/traps.c       2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/kernel/traps.c    2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
 @@ -1379,6 +1379,7 @@
         */
        if (cpu_has_mips_r2) {
@@ -79,10 +71,8 @@ Index: linux-2.6.25.7/arch/mips/kernel/traps.c
                cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
                if (cp0_perfcount_irq == cp0_compare_irq)
                        cp0_perfcount_irq = -1;
-Index: linux-2.6.25.7/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/pci/Makefile 2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/pci/Makefile      2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
 @@ -48,3 +48,4 @@
  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
index c462797..38d7f00 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.7/drivers/char/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/char/Makefile  2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/char/Makefile       2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
 @@ -113,6 +113,10 @@
  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o
@@ -13,19 +11,15 @@ Index: linux-2.6.25.7/drivers/char/Makefile
  # Files generated that shall be removed upon make clean
  clean-files := consolemap_deftbl.c defkeymap.c
  
-Index: linux-2.6.25.7/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile      2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/mtd/maps/Makefile   2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
 @@ -68,3 +68,4 @@
  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
  obj-$(CONFIG_MTD_MTX1)                += mtx-1_flash.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o
-Index: linux-2.6.25.7/drivers/net/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/net/Kconfig    2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/net/Kconfig 2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
 @@ -351,6 +351,12 @@
  
  source "drivers/net/arm/Kconfig"
@@ -39,10 +33,8 @@ Index: linux-2.6.25.7/drivers/net/Kconfig
  config AX88796
        tristate "ASIX AX88796 NE2000 clone support"
        depends on ARM || MIPS || SUPERH
-Index: linux-2.6.25.7/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/serial/Kconfig 2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/serial/Kconfig      2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
 @@ -1327,6 +1327,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
@@ -58,20 +50,16 @@ Index: linux-2.6.25.7/drivers/serial/Kconfig
  config SERIAL_QE
        tristate "Freescale QUICC Engine serial port support"
        depends on QUICC_ENGINE
-Index: linux-2.6.25.7/drivers/serial/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/serial/Makefile        2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/serial/Makefile     2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
 @@ -66,4 +66,5 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
-Index: linux-2.6.25.7/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/watchdog/Makefile      2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/watchdog/Makefile   2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
 @@ -96,6 +96,7 @@
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
@@ -80,19 +68,15 @@ Index: linux-2.6.25.7/drivers/watchdog/Makefile
  
  # PARISC Architecture
  
-Index: linux-2.6.25.7/drivers/net/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/net/Makefile   2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/net/Makefile        2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
 @@ -254,3 +254,4 @@
  obj-$(CONFIG_NETXEN_NIC) += netxen/
  obj-$(CONFIG_NIU) += niu.o
  obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
-Index: linux-2.6.25.7/drivers/crypto/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/crypto/Kconfig 2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/crypto/Kconfig      2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
 @@ -9,6 +9,9 @@
          If you say N, all options in this submenu will be skipped and disabled.
  
@@ -103,19 +87,15 @@ Index: linux-2.6.25.7/drivers/crypto/Kconfig
  
  config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
-Index: linux-2.6.25.7/drivers/crypto/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/crypto/Makefile        2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/crypto/Makefile     2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/crypto/Makefile
++++ b/drivers/crypto/Makefile
 @@ -2,3 +2,4 @@
  obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
  obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
  obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
 +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
-Index: linux-2.6.25.7/drivers/usb/host/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/usb/host/Kconfig       2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/usb/host/Kconfig    2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
 @@ -260,3 +260,9 @@
          To compile this driver as a module, choose M here: the
          module will be called r8a66597-hcd.
@@ -126,10 +106,8 @@ Index: linux-2.6.25.7/drivers/usb/host/Kconfig
 +      default y
 +      help
 +              Danube USB Host Controller
-Index: linux-2.6.25.7/drivers/usb/host/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/usb/host/Makefile      2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/usb/host/Makefile   2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/usb/host/Makefile
++++ b/drivers/usb/host/Makefile
 @@ -16,4 +16,6 @@
  obj-$(CONFIG_USB_SL811_CS)    += sl811_cs.o
  obj-$(CONFIG_USB_U132_HCD)    += u132-hcd.o
@@ -138,10 +116,8 @@ Index: linux-2.6.25.7/drivers/usb/host/Makefile
 +obj-$(CONFIG_USB_DWC_HCD) += dwc_otg_hcd.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o \
 +                      dwc_otg_attr.o dwc_otg_driver.o dwc_otg_cil.o \
 +                      dwc_otg_cil_intr.o dwc_otg_proc.o dwc_otg_ifx.o
-Index: linux-2.6.25.7/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/leds/Kconfig   2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/leds/Kconfig        2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
 @@ -151,6 +151,12 @@
          To compile this driver as a module, choose M here: the
          module will be called leds-clevo-mail.
@@ -155,10 +131,8 @@ Index: linux-2.6.25.7/drivers/leds/Kconfig
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.25.7/drivers/leds/Makefile
-===================================================================
---- linux-2.6.25.7.orig/drivers/leds/Makefile  2008-06-26 09:53:43.000000000 +0200
-+++ linux-2.6.25.7/drivers/leds/Makefile       2008-06-26 09:53:53.000000000 +0200
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
 @@ -22,6 +22,7 @@
  obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
@@ -167,10 +141,8 @@ Index: linux-2.6.25.7/drivers/leds/Makefile
  
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-Index: linux-2.6.25.7/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/drivers/watchdog/Kconfig       2008-06-26 10:21:00.000000000 +0200
-+++ linux-2.6.25.7/drivers/watchdog/Kconfig    2008-06-26 10:22:13.000000000 +0200
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
 @@ -670,6 +670,12 @@
        help
          Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
index 1a0f98c..38c58bb 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.9/arch/mips/mm/cache.c
-===================================================================
---- linux-2.6.25.9.orig/arch/mips/mm/cache.c   2008-07-06 05:04:46.000000000 +0200
-+++ linux-2.6.25.9/arch/mips/mm/cache.c        2008-07-06 05:05:07.000000000 +0200
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
 @@ -50,6 +50,8 @@
  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
  
index 1124ab6..0fe4883 100644 (file)
@@ -10,7 +10,7 @@ ARCH:=powerpc
 BOARD:=ps3
 BOARDNAME:=Sony PS3 Game Console
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 KERNEL_CC:=
 
index a03b894..4d11d7f 100644 (file)
@@ -12,7 +12,7 @@ BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2 vdi
 SUBTARGETS=generic
 
-LINUX_VERSION:=2.6.25.10
+LINUX_VERSION:=2.6.25.12
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci