Changeset 11933


Ignore:
Timestamp:
2008-07-26T12:53:23+02:00 (8 years ago)
Author:
juhosg
Message:

[kernel] update to 2.6.25.12

Location:
trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r11829 r11933  
    2626  LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4 
    2727endif 
    28 ifeq ($(LINUX_VERSION),2.6.25.10) 
    29   LINUX_KERNEL_MD5SUM:=a6b0aa5b1fa1ae5a02a7b67345f01e86 
     28ifeq ($(LINUX_VERSION),2.6.25.12) 
     29  LINUX_KERNEL_MD5SUM:=7c413ecf94a84776aaec6ada5694318c 
    3030endif 
    3131ifeq ($(LINUX_VERSION),2.6.26) 
  • trunk/target/linux/adm5120/Makefile

    r11667 r11933  
    1010BOARD:=adm5120 
    1111BOARDNAME:=Infineon/ADMtek ADM5120 
    12 LINUX_VERSION:=2.6.25.10 
     12LINUX_VERSION:=2.6.25.12 
    1313SUBTARGETS:=router_le router_be 
    1414INITRAMFS_EXTRA_FILES:= 
  • trunk/target/linux/ar7/Makefile

    r11667 r11933  
    1212FEATURES:=squashfs jffs2 atm 
    1313 
    14 LINUX_VERSION:=2.6.25.10 
     14LINUX_VERSION:=2.6.25.12 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch

    r11452 r11933  
    1515  
    1616 #if defined (CONFIG_SERIAL_8250_AU1X00) 
    17 @@ -2455,7 +2462,11 @@ 
     17@@ -2457,7 +2464,11 @@ 
    1818 { 
    1919        struct uart_8250_port *up = (struct uart_8250_port *)port; 
  • trunk/target/linux/ar71xx/Makefile

    r11894 r11933  
    1212FEATURES:=squashfs tgz broken 
    1313 
    14 LINUX_VERSION:=2.6.25.10 
     14LINUX_VERSION:=2.6.25.12 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ar71xx/patches/003-ar71xx_usb_host.patch

    r11894 r11933  
    4848+++ b/drivers/usb/host/ohci-hcd.c 
    4949@@ -1057,6 +1057,11 @@ 
    50  #define PLATFORM_DRIVER                ohci_hcd_sm501_driver 
     50 #define SM501_OHCI_DRIVER      ohci_hcd_sm501_driver 
    5151 #endif 
    5252  
  • trunk/target/linux/ar71xx/patches/900-mips_multi_machine_support.patch

    r11894 r11933  
    124124--- a/arch/mips/Kconfig 
    125125+++ b/arch/mips/Kconfig 
    126 @@ -700,6 +700,7 @@ 
     126@@ -701,6 +701,7 @@ 
    127127  
    128128 endchoice 
     
    132132 source "arch/mips/basler/excite/Kconfig" 
    133133 source "arch/mips/jazz/Kconfig" 
    134 @@ -857,6 +858,9 @@ 
     134@@ -858,6 +859,9 @@ 
    135135 config MIPS_DISABLE_OBSOLETE_IDE 
    136136        bool 
  • trunk/target/linux/at91/Makefile

    r11631 r11933  
    1212FEATURES:=squashfs usb 
    1313 
    14 LINUX_VERSION:=2.6.25.10 
     14LINUX_VERSION:=2.6.25.12 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/at91/patches-2.6.25/000-at91patches.patch

    r11631 r11933  
    1 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Kconfig linux-2.6/arch/arm/mach-at91/Kconfig 
    2 --- linux-2.6.25/arch/arm/mach-at91/Kconfig     2008-05-03 00:15:44.000000000 +0200 
    3 +++ linux-2.6/arch/arm/mach-at91/Kconfig        2008-04-25 21:15:43.000000000 +0200 
     1--- a/arch/arm/mach-at91/Kconfig 
     2+++ b/arch/arm/mach-at91/Kconfig 
    43@@ -12,18 +12,28 @@ 
    54  
     
    166165        int "Kernel HZ (jiffies per second)" 
    167166        range 32 1024 
    168 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/Makefile linux-2.6/arch/arm/mach-at91/Makefile 
    169 --- linux-2.6.25/arch/arm/mach-at91/Makefile    2008-05-03 00:15:44.000000000 +0200 
    170 +++ linux-2.6/arch/arm/mach-at91/Makefile       2008-04-25 21:15:43.000000000 +0200 
     167--- a/arch/arm/mach-at91/Makefile 
     168+++ b/arch/arm/mach-at91/Makefile 
    171169@@ -28,16 +28,26 @@ 
    172170 obj-$(CONFIG_MACH_KB9200)      += board-kb9202.o 
     
    208206 ifeq ($(CONFIG_PM_DEBUG),y) 
    209207 CFLAGS_pm.o += -DDEBUG 
    210 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91cap9.c linux-2.6/arch/arm/mach-at91/at91cap9.c 
    211 --- linux-2.6.25/arch/arm/mach-at91/at91cap9.c  2008-05-03 00:15:44.000000000 +0200 
    212 +++ linux-2.6/arch/arm/mach-at91/at91cap9.c     2008-05-05 22:01:39.000000000 +0200 
     208--- a/arch/arm/mach-at91/at91cap9.c 
     209+++ b/arch/arm/mach-at91/at91cap9.c 
    213210@@ -13,12 +13,15 @@ 
    214211  */ 
     
    261258  
    262259 /* -------------------------------------------------------------------- 
    263 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 
    264 --- linux-2.6.25/arch/arm/mach-at91/at91cap9_devices.c  2008-05-03 00:15:44.000000000 +0200 
    265 +++ linux-2.6/arch/arm/mach-at91/at91cap9_devices.c     2008-05-05 22:01:39.000000000 +0200 
     260--- a/arch/arm/mach-at91/at91cap9_devices.c 
     261+++ b/arch/arm/mach-at91/at91cap9_devices.c 
    266262@@ -13,18 +13,20 @@ 
    267263  */ 
     
    555551 } 
    556552  
    557 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 
    558 --- linux-2.6.25/arch/arm/mach-at91/at91rm9200_devices.c        2008-05-03 00:15:44.000000000 +0200 
    559 +++ linux-2.6/arch/arm/mach-at91/at91rm9200_devices.c   2008-04-25 21:15:43.000000000 +0200 
     553--- a/arch/arm/mach-at91/at91rm9200_devices.c 
     554+++ b/arch/arm/mach-at91/at91rm9200_devices.c 
    560555@@ -513,7 +513,18 @@ 
    561556  *  SPI 
     
    735730 } 
    736731  
    737 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 
    738 --- linux-2.6.25/arch/arm/mach-at91/at91rm9200_time.c   2008-05-03 00:15:33.000000000 +0200 
    739 +++ linux-2.6/arch/arm/mach-at91/at91rm9200_time.c      2008-04-25 21:15:43.000000000 +0200 
     732--- a/arch/arm/mach-at91/at91rm9200_time.c 
     733+++ b/arch/arm/mach-at91/at91rm9200_time.c 
    740734@@ -136,8 +136,6 @@ 
    741735        u32             alm; 
     
    747741        raw_local_irq_save(flags); 
    748742  
    749 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9260.c linux-2.6/arch/arm/mach-at91/at91sam9260.c 
    750 --- linux-2.6.25/arch/arm/mach-at91/at91sam9260.c       2008-05-03 00:15:44.000000000 +0200 
    751 +++ linux-2.6/arch/arm/mach-at91/at91sam9260.c  2008-04-25 21:15:43.000000000 +0200 
     743--- a/arch/arm/mach-at91/at91sam9260.c 
     744+++ b/arch/arm/mach-at91/at91sam9260.c 
    752745@@ -11,6 +11,7 @@ 
    753746  */ 
     
    786779                        | (1 << AT91SAM9260_ID_IRQ2); 
    787780  
    788 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 
    789 --- linux-2.6.25/arch/arm/mach-at91/at91sam9260_devices.c       2008-05-03 00:15:44.000000000 +0200 
    790 +++ linux-2.6/arch/arm/mach-at91/at91sam9260_devices.c  2008-04-25 21:15:43.000000000 +0200 
     781--- a/arch/arm/mach-at91/at91sam9260_devices.c 
     782+++ b/arch/arm/mach-at91/at91sam9260_devices.c 
    791783@@ -19,8 +19,8 @@ 
    792784 #include <asm/arch/board.h> 
     
    959951 } 
    960952  
    961 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9261.c linux-2.6/arch/arm/mach-at91/at91sam9261.c 
    962 --- linux-2.6.25/arch/arm/mach-at91/at91sam9261.c       2008-05-03 00:15:44.000000000 +0200 
    963 +++ linux-2.6/arch/arm/mach-at91/at91sam9261.c  2008-04-25 21:15:43.000000000 +0200 
     953--- a/arch/arm/mach-at91/at91sam9261.c 
     954+++ b/arch/arm/mach-at91/at91sam9261.c 
    964955@@ -11,12 +11,14 @@ 
    965956  */ 
     
    997988                        | (1 << AT91SAM9261_ID_IRQ2); 
    998989  
    999 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 
    1000 --- linux-2.6.25/arch/arm/mach-at91/at91sam9261_devices.c       2008-05-03 00:15:44.000000000 +0200 
    1001 +++ linux-2.6/arch/arm/mach-at91/at91sam9261_devices.c  2008-04-25 21:15:43.000000000 +0200 
     990--- a/arch/arm/mach-at91/at91sam9261_devices.c 
     991+++ b/arch/arm/mach-at91/at91sam9261_devices.c 
    1002992@@ -24,7 +24,7 @@ 
    1003993 #include <asm/arch/gpio.h> 
     
    11171107 } 
    11181108  
    1119 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9263.c linux-2.6/arch/arm/mach-at91/at91sam9263.c 
    1120 --- linux-2.6.25/arch/arm/mach-at91/at91sam9263.c       2008-05-03 00:15:44.000000000 +0200 
    1121 +++ linux-2.6/arch/arm/mach-at91/at91sam9263.c  2008-04-25 21:15:43.000000000 +0200 
     1109--- a/arch/arm/mach-at91/at91sam9263.c 
     1110+++ b/arch/arm/mach-at91/at91sam9263.c 
    11221111@@ -11,12 +11,14 @@ 
    11231112  */ 
     
    11551144  
    11561145        /* Init clock subsystem */ 
    1157 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 
    1158 --- linux-2.6.25/arch/arm/mach-at91/at91sam9263_devices.c       2008-05-03 00:15:44.000000000 +0200 
    1159 +++ linux-2.6/arch/arm/mach-at91/at91sam9263_devices.c  2008-04-25 21:16:23.000000000 +0200 
     1146--- a/arch/arm/mach-at91/at91sam9263_devices.c 
     1147+++ b/arch/arm/mach-at91/at91sam9263_devices.c 
    11601148@@ -22,8 +22,8 @@ 
    11611149 #include <asm/arch/board.h> 
     
    12981286 } 
    12991287  
    1300 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 
    1301 --- linux-2.6.25/arch/arm/mach-at91/at91sam926x_time.c  2008-05-03 00:15:44.000000000 +0200 
    1302 +++ linux-2.6/arch/arm/mach-at91/at91sam926x_time.c     2008-04-25 21:15:43.000000000 +0200 
     1288--- a/arch/arm/mach-at91/at91sam926x_time.c 
     1289+++ b/arch/arm/mach-at91/at91sam926x_time.c 
    13031290@@ -1,23 +1,20 @@ 
    13041291 /* 
     
    15351522 }; 
    15361523- 
    1537 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/at91sam9rl.c linux-2.6/arch/arm/mach-at91/at91sam9rl.c 
    1538 --- linux-2.6.25/arch/arm/mach-at91/at91sam9rl.c        2007-10-09 22:31:38.000000000 +0200 
    1539 +++ linux-2.6/arch/arm/mach-at91/at91sam9rl.c   2008-04-25 21:15:43.000000000 +0200 
     1524--- a/arch/arm/mach-at91/at91sam9rl.c 
     1525+++ b/arch/arm/mach-at91/at91sam9rl.c 
    15401526@@ -10,6 +10,7 @@ 
    15411527  */ 
     
    15741560  
    15751561        /* Init clock subsystem */ 
    1576 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 
    1577 --- linux-2.6.25/arch/arm/mach-at91/at91sam9rl_devices.c        2008-05-03 00:15:44.000000000 +0200 
    1578 +++ linux-2.6/arch/arm/mach-at91/at91sam9rl_devices.c   2008-05-02 00:52:36.000000000 +0200 
     1562--- a/arch/arm/mach-at91/at91sam9rl_devices.c 
     1563+++ b/arch/arm/mach-at91/at91sam9rl_devices.c 
    15791564@@ -20,12 +20,107 @@ 
    15801565 #include <asm/arch/gpio.h> 
     
    18741859 } 
    18751860  
    1876 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 
    1877 --- linux-2.6.25/arch/arm/mach-at91/board-cam60.c       1970-01-01 02:00:00.000000000 +0200 
    1878 +++ linux-2.6/arch/arm/mach-at91/board-cam60.c  2008-04-25 21:15:43.000000000 +0200 
     1861--- /dev/null 
     1862+++ b/arch/arm/mach-at91/board-cam60.c 
    18791863@@ -0,0 +1,180 @@ 
    18801864+/* 
     
    20582042+       .init_machine   = cam60_board_init, 
    20592043+MACHINE_END 
    2060 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 
    2061 --- linux-2.6.25/arch/arm/mach-at91/board-cap9adk.c     2008-05-03 00:15:44.000000000 +0200 
    2062 +++ linux-2.6/arch/arm/mach-at91/board-cap9adk.c        2008-05-05 22:01:39.000000000 +0200 
     2044--- a/arch/arm/mach-at91/board-cap9adk.c 
     2045+++ b/arch/arm/mach-at91/board-cap9adk.c 
    20632046@@ -36,16 +36,14 @@ 
    20642047 #include <asm/hardware.h> 
     
    21202103        /* AC97 */ 
    21212104        at91_add_device_ac97(&cap9adk_ac97_data); 
    2122 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 
    2123 --- linux-2.6.25/arch/arm/mach-at91/board-carmeva.c     2008-05-03 00:15:33.000000000 +0200 
    2124 +++ linux-2.6/arch/arm/mach-at91/board-carmeva.c        2008-04-25 21:15:43.000000000 +0200 
     2105--- a/arch/arm/mach-at91/board-carmeva.c 
     2106+++ b/arch/arm/mach-at91/board-carmeva.c 
    21252107@@ -40,24 +40,21 @@ 
    21262108 #include "generic.h" 
     
    21982180  
    21992181 MACHINE_START(CARMEVA, "Carmeva") 
    2200 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 
    2201 --- linux-2.6.25/arch/arm/mach-at91/board-chub.c        1970-01-01 02:00:00.000000000 +0200 
    2202 +++ linux-2.6/arch/arm/mach-at91/board-chub.c   2008-04-25 21:15:43.000000000 +0200 
     2182--- /dev/null 
     2183+++ b/arch/arm/mach-at91/board-chub.c 
    22032184@@ -0,0 +1,132 @@ 
    22042185+/* 
     
    23342315+       .init_machine   = chub_board_init, 
    23352316+MACHINE_END 
    2336 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 
    2337 --- linux-2.6.25/arch/arm/mach-at91/board-csb337.c      2008-05-03 00:15:44.000000000 +0200 
    2338 +++ linux-2.6/arch/arm/mach-at91/board-csb337.c 2008-05-02 00:05:42.000000000 +0200 
     2317--- a/arch/arm/mach-at91/board-csb337.c 
     2318+++ b/arch/arm/mach-at91/board-csb337.c 
    23392319@@ -61,6 +61,7 @@ 
    23402320  
     
    23692349  
    23702350  
    2371 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 
    2372 --- linux-2.6.25/arch/arm/mach-at91/board-csb637.c      2008-05-03 00:15:33.000000000 +0200 
    2373 +++ linux-2.6/arch/arm/mach-at91/board-csb637.c 2008-04-25 21:15:43.000000000 +0200 
     2351--- a/arch/arm/mach-at91/board-csb637.c 
     2352+++ b/arch/arm/mach-at91/board-csb637.c 
    23742353@@ -40,27 +40,16 @@ 
    23752354 #include "generic.h" 
     
    24242403        at91_add_device_serial(); 
    24252404        /* Ethernet */ 
    2426 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 
    2427 --- linux-2.6.25/arch/arm/mach-at91/board-dk.c  2008-05-03 00:15:44.000000000 +0200 
    2428 +++ linux-2.6/arch/arm/mach-at91/board-dk.c     2008-05-03 00:44:06.000000000 +0200 
     2405--- a/arch/arm/mach-at91/board-dk.c 
     2406+++ b/arch/arm/mach-at91/board-dk.c 
    24292407@@ -25,6 +25,7 @@ 
    24302408 #include <linux/init.h> 
     
    26812659  
    26822660 MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK") 
    2683 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 
    2684 --- linux-2.6.25/arch/arm/mach-at91/board-eb9200.c      2008-05-03 00:15:33.000000000 +0200 
    2685 +++ linux-2.6/arch/arm/mach-at91/board-eb9200.c 2008-04-25 21:15:43.000000000 +0200 
     2661--- a/arch/arm/mach-at91/board-eb9200.c 
     2662+++ b/arch/arm/mach-at91/board-eb9200.c 
    26862663@@ -40,24 +40,24 @@ 
    26872664 #include "generic.h" 
     
    27222699  
    27232700 static void __init eb9200_init_irq(void) 
    2724 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 
    2725 --- linux-2.6.25/arch/arm/mach-at91/board-ecbat91.c     1970-01-01 02:00:00.000000000 +0200 
    2726 +++ linux-2.6/arch/arm/mach-at91/board-ecbat91.c        2008-04-25 21:15:43.000000000 +0200 
     2701--- /dev/null 
     2702+++ b/arch/arm/mach-at91/board-ecbat91.c 
    27272703@@ -0,0 +1,178 @@ 
    27282704+/* 
     
    29042880+       .init_machine   = ecb_at91board_init, 
    29052881+MACHINE_END 
    2906 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 
    2907 --- linux-2.6.25/arch/arm/mach-at91/board-ek.c  2008-05-03 00:15:44.000000000 +0200 
    2908 +++ linux-2.6/arch/arm/mach-at91/board-ek.c     2008-05-03 00:44:38.000000000 +0200 
     2882--- a/arch/arm/mach-at91/board-ek.c 
     2883+++ b/arch/arm/mach-at91/board-ek.c 
    29092884@@ -25,6 +25,7 @@ 
    29102885 #include <linux/init.h> 
     
    31583133  
    31593134 MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK") 
    3160 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 
    3161 --- linux-2.6.25/arch/arm/mach-at91/board-homematic.c   1970-01-01 02:00:00.000000000 +0200 
    3162 +++ linux-2.6/arch/arm/mach-at91/board-homematic.c      2008-04-25 21:15:43.000000000 +0200 
     3135--- /dev/null 
     3136+++ b/arch/arm/mach-at91/board-homematic.c 
    31633137@@ -0,0 +1,163 @@ 
    31643138+/* 
     
    33253299+       .init_machine   = homematic_board_init, 
    33263300+MACHINE_END 
    3327 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 
    3328 --- linux-2.6.25/arch/arm/mach-at91/board-kb9202.c      2008-05-03 00:15:33.000000000 +0200 
    3329 +++ linux-2.6/arch/arm/mach-at91/board-kb9202.c 2008-04-25 21:15:43.000000000 +0200 
     3301--- a/arch/arm/mach-at91/board-kb9202.c 
     3302+++ b/arch/arm/mach-at91/board-kb9202.c 
    33303303@@ -37,19 +37,10 @@ 
    33313304 #include <asm/arch/board.h> 
     
    34313404  
    34323405 MACHINE_START(KB9200, "KB920x") 
    3433 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 
    3434 --- linux-2.6.25/arch/arm/mach-at91/board-qil-a9260.c   1970-01-01 02:00:00.000000000 +0200 
    3435 +++ linux-2.6/arch/arm/mach-at91/board-qil-a9260.c      2008-04-25 21:15:43.000000000 +0200 
     3406--- /dev/null 
     3407+++ b/arch/arm/mach-at91/board-qil-a9260.c 
    34363408@@ -0,0 +1,255 @@ 
    34373409+/* 
     
    36903662+       .init_machine   = ek_board_init, 
    36913663+MACHINE_END 
    3692 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 
    3693 --- linux-2.6.25/arch/arm/mach-at91/board-sam9-l9260.c  1970-01-01 02:00:00.000000000 +0200 
    3694 +++ linux-2.6/arch/arm/mach-at91/board-sam9-l9260.c     2008-04-25 21:15:43.000000000 +0200 
     3664--- /dev/null 
     3665+++ b/arch/arm/mach-at91/board-sam9-l9260.c 
    36953666@@ -0,0 +1,199 @@ 
    36963667+/* 
     
    38933864+       .init_machine   = ek_board_init, 
    38943865+MACHINE_END 
    3895 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 
    3896 --- linux-2.6.25/arch/arm/mach-at91/board-sam9260ek.c   2008-05-03 00:15:33.000000000 +0200 
    3897 +++ linux-2.6/arch/arm/mach-at91/board-sam9260ek.c      2008-05-01 23:56:24.000000000 +0200 
     3866--- a/arch/arm/mach-at91/board-sam9260ek.c 
     3867+++ b/arch/arm/mach-at91/board-sam9260ek.c 
    38983868@@ -25,6 +25,10 @@ 
    38993869 #include <linux/module.h> 
     
    40884058  
    40894059 MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") 
    4090 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 
    4091 --- linux-2.6.25/arch/arm/mach-at91/board-sam9261ek.c   2008-05-03 00:15:44.000000000 +0200 
    4092 +++ linux-2.6/arch/arm/mach-at91/board-sam9261ek.c      2008-05-01 23:53:20.000000000 +0200 
     4060--- a/arch/arm/mach-at91/board-sam9261ek.c 
     4061+++ b/arch/arm/mach-at91/board-sam9261ek.c 
    40934062@@ -26,6 +26,8 @@ 
    40944063 #include <linux/platform_device.h> 
     
    42974266  
    42984267 MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK") 
    4299 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 
    4300 --- linux-2.6.25/arch/arm/mach-at91/board-sam9263ek.c   2008-05-03 00:15:44.000000000 +0200 
    4301 +++ linux-2.6/arch/arm/mach-at91/board-sam9263ek.c      2008-05-01 23:53:20.000000000 +0200 
     4268--- a/arch/arm/mach-at91/board-sam9263ek.c 
     4269+++ b/arch/arm/mach-at91/board-sam9263ek.c 
    43024270@@ -43,29 +43,24 @@ 
    43034271  
     
    43794347  
    43804348 MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK") 
    4381 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 
    4382 --- linux-2.6.25/arch/arm/mach-at91/board-sam9rlek.c    2008-05-03 00:15:33.000000000 +0200 
    4383 +++ linux-2.6/arch/arm/mach-at91/board-sam9rlek.c       2008-04-25 21:15:43.000000000 +0200 
     4349--- a/arch/arm/mach-at91/board-sam9rlek.c 
     4350+++ b/arch/arm/mach-at91/board-sam9rlek.c 
    43844351@@ -29,29 +29,24 @@ 
    43854352  
     
    44554422  
    44564423 MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") 
    4457 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 
    4458 --- linux-2.6.25/arch/arm/mach-at91/board-tms.c 1970-01-01 02:00:00.000000000 +0200 
    4459 +++ linux-2.6/arch/arm/mach-at91/board-tms.c    2008-04-25 21:15:43.000000000 +0200 
     4424--- /dev/null 
     4425+++ b/arch/arm/mach-at91/board-tms.c 
    44604426@@ -0,0 +1,198 @@ 
    44614427+/* 
     
    46574623+       .init_machine   = tms_board_init, 
    46584624+MACHINE_END 
    4659 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 
    4660 --- linux-2.6.25/arch/arm/mach-at91/board-tt9200.c      1970-01-01 02:00:00.000000000 +0200 
    4661 +++ linux-2.6/arch/arm/mach-at91/board-tt9200.c 2008-04-25 21:15:43.000000000 +0200 
     4625--- /dev/null 
     4626+++ b/arch/arm/mach-at91/board-tt9200.c 
    46624627@@ -0,0 +1,192 @@ 
    46634628+/* 
     
    48534818+       .init_machine   = tt9200_board_init, 
    48544819+MACHINE_END 
    4855 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 
    4856 --- linux-2.6.25/arch/arm/mach-at91/board-usb-a9260.c   1970-01-01 02:00:00.000000000 +0200 
    4857 +++ linux-2.6/arch/arm/mach-at91/board-usb-a9260.c      2008-04-25 21:15:43.000000000 +0200 
     4820--- /dev/null 
     4821+++ b/arch/arm/mach-at91/board-usb-a9260.c 
    48584822@@ -0,0 +1,215 @@ 
    48594823+/* 
     
    50725036+       .init_machine   = ek_board_init, 
    50735037+MACHINE_END 
    5074 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 
    5075 --- linux-2.6.25/arch/arm/mach-at91/board-usb-a9263.c   1970-01-01 02:00:00.000000000 +0200 
    5076 +++ linux-2.6/arch/arm/mach-at91/board-usb-a9263.c      2008-04-25 21:15:43.000000000 +0200 
     5038--- /dev/null 
     5039+++ b/arch/arm/mach-at91/board-usb-a9263.c 
    50775040@@ -0,0 +1,230 @@ 
    50785041+/* 
     
    53065269+       .init_machine   = ek_board_init, 
    53075270+MACHINE_END 
    5308 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/clock.c linux-2.6/arch/arm/mach-at91/clock.c 
    5309 --- linux-2.6.25/arch/arm/mach-at91/clock.c     2008-05-03 00:15:44.000000000 +0200 
    5310 +++ linux-2.6/arch/arm/mach-at91/clock.c        2008-04-25 21:15:43.000000000 +0200 
     5271--- a/arch/arm/mach-at91/clock.c 
     5272+++ b/arch/arm/mach-at91/clock.c 
    53115273@@ -32,6 +32,7 @@ 
    53125274 #include <asm/arch/cpu.h> 
     
    54345396        clk_enable(&mck); 
    54355397  
    5436 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/generic.h linux-2.6/arch/arm/mach-at91/generic.h 
    5437 --- linux-2.6.25/arch/arm/mach-at91/generic.h   2008-05-03 00:15:44.000000000 +0200 
    5438 +++ linux-2.6/arch/arm/mach-at91/generic.h      2008-04-25 21:15:43.000000000 +0200 
     5398--- a/arch/arm/mach-at91/generic.h 
     5399+++ b/arch/arm/mach-at91/generic.h 
    54395400@@ -41,6 +41,7 @@ 
    54405401  /* Power Management */ 
     
    54455406  /* GPIO */ 
    54465407 #define AT91RM9200_PQFP                3       /* AT91RM9200 PQFP package has 3 banks */ 
    5447 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/gpio.c linux-2.6/arch/arm/mach-at91/gpio.c 
    5448 --- linux-2.6.25/arch/arm/mach-at91/gpio.c      2008-05-03 00:15:44.000000000 +0200 
    5449 +++ linux-2.6/arch/arm/mach-at91/gpio.c 2008-04-25 21:15:43.000000000 +0200 
     5408--- a/arch/arm/mach-at91/gpio.c 
     5409+++ b/arch/arm/mach-at91/gpio.c 
    54505410@@ -490,7 +490,8 @@ 
    54515411  
     
    54665426                        last->next = data; 
    54675427        } 
    5468 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/ics1523.c linux-2.6/arch/arm/mach-at91/ics1523.c 
    5469 --- linux-2.6.25/arch/arm/mach-at91/ics1523.c   1970-01-01 02:00:00.000000000 +0200 
    5470 +++ linux-2.6/arch/arm/mach-at91/ics1523.c      2008-04-25 21:15:43.000000000 +0200 
     5428--- /dev/null 
     5429+++ b/arch/arm/mach-at91/ics1523.c 
    54715430@@ -0,0 +1,208 @@ 
    54725431+/* 
     
    56785637+       return ack; 
    56795638+} 
    5680 diff -urN -x CVS linux-2.6.25/arch/arm/mach-at91/pm.c linux-2.6/arch/arm/mach-at91/pm.c 
    5681 --- linux-2.6.25/arch/arm/mach-at91/pm.c        2008-05-03 00:15:44.000000000 +0200 
    5682 +++ linux-2.6/arch/arm/mach-at91/pm.c   2008-04-25 21:15:43.000000000 +0200 
     5639--- a/arch/arm/mach-at91/pm.c 
     5640+++ b/arch/arm/mach-at91/pm.c 
    56835641@@ -26,12 +26,144 @@ 
    56845642 #include <asm/mach-types.h> 
     
    59415899 } 
    59425900 arch_initcall(at91_pm_init); 
    5943 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 
    5944 --- linux-2.6.25/arch/arm/mach-at91/pm_slowclock.S      1970-01-01 02:00:00.000000000 +0200 
    5945 +++ linux-2.6/arch/arm/mach-at91/pm_slowclock.S 2008-05-03 01:00:33.000000000 +0200 
     5901--- /dev/null 
     5902+++ b/arch/arm/mach-at91/pm_slowclock.S 
    59465903@@ -0,0 +1,283 @@ 
    59475904+/* 
     
    62286185+ENTRY(at91_slow_clock_sz) 
    62296186+       .word .-at91_slow_clock 
    6230 diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/Makefile linux-2.6/arch/arm/mach-ks8695/Makefile 
    6231 --- linux-2.6.25/arch/arm/mach-ks8695/Makefile  2008-05-03 00:15:44.000000000 +0200 
    6232 +++ linux-2.6/arch/arm/mach-ks8695/Makefile     2007-12-31 15:04:45.000000000 +0200 
     6187--- a/arch/arm/mach-ks8695/Makefile 
     6188+++ b/arch/arm/mach-ks8695/Makefile 
    62336189@@ -11,5 +11,8 @@ 
    62346190 # PCI support is optional 
     
    62406196 # Board-specific support 
    62416197 obj-$(CONFIG_MACH_KS8695)      += board-micrel.o 
    6242 diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/devices.c linux-2.6/arch/arm/mach-ks8695/devices.c 
    6243 --- linux-2.6.25/arch/arm/mach-ks8695/devices.c 2007-10-09 22:31:38.000000000 +0200 
    6244 +++ linux-2.6/arch/arm/mach-ks8695/devices.c    2007-12-31 10:43:55.000000000 +0200 
     6198--- a/arch/arm/mach-ks8695/devices.c 
     6199+++ b/arch/arm/mach-ks8695/devices.c 
    62456200@@ -176,6 +176,27 @@ 
    62466201 #endif 
     
    62716226  
    62726227 /* 
    6273 diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/gpio.c linux-2.6/arch/arm/mach-ks8695/gpio.c 
    6274 --- linux-2.6.25/arch/arm/mach-ks8695/gpio.c    2008-05-03 00:15:44.000000000 +0200 
    6275 +++ linux-2.6/arch/arm/mach-ks8695/gpio.c       2007-12-31 14:49:20.000000000 +0200 
     6228--- a/arch/arm/mach-ks8695/gpio.c 
     6229+++ b/arch/arm/mach-ks8695/gpio.c 
    62766230@@ -136,9 +136,9 @@ 
    62776231        /* set line state */ 
     
    63076261 EXPORT_SYMBOL(gpio_get_value); 
    63086262  
    6309 diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/leds.c linux-2.6/arch/arm/mach-ks8695/leds.c 
    6310 --- linux-2.6.25/arch/arm/mach-ks8695/leds.c    1970-01-01 02:00:00.000000000 +0200 
    6311 +++ linux-2.6/arch/arm/mach-ks8695/leds.c       2007-12-31 15:18:25.000000000 +0200 
     6263--- /dev/null 
     6264+++ b/arch/arm/mach-ks8695/leds.c 
    63126265@@ -0,0 +1,94 @@ 
    63136266+/* 
     
    64056358+ 
    64066359+__initcall(leds_init); 
    6407 diff -urN -x CVS linux-2.6.25/arch/arm/mach-ks8695/pci.c linux-2.6/arch/arm/mach-ks8695/pci.c 
    6408 --- linux-2.6.25/arch/arm/mach-ks8695/pci.c     2008-05-03 00:15:44.000000000 +0200 
    6409 +++ linux-2.6/arch/arm/mach-ks8695/pci.c        2008-05-08 22:03:41.000000000 +0200 
     6360--- a/arch/arm/mach-ks8695/pci.c 
     6361+++ b/arch/arm/mach-ks8695/pci.c 
    64106362@@ -141,7 +141,7 @@ 
    64116363        .write  = ks8695_pci_writeconfig, 
     
    64176369        return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys); 
    64186370 } 
    6419 diff -urN -x CVS linux-2.6.25/drivers/char/Kconfig linux-2.6/drivers/char/Kconfig 
    6420 --- linux-2.6.25/drivers/char/Kconfig   2008-05-03 00:15:47.000000000 +0200 
    6421 +++ linux-2.6/drivers/char/Kconfig      2008-03-09 15:14:46.000000000 +0200 
     6371--- a/drivers/char/Kconfig 
     6372+++ b/drivers/char/Kconfig 
    64226373@@ -1056,5 +1056,21 @@ 
    64236374  
     
    64426393 endmenu 
    64436394  
    6444 diff -urN -x CVS linux-2.6.25/drivers/char/Makefile linux-2.6/drivers/char/Makefile 
    6445 --- linux-2.6.25/drivers/char/Makefile  2008-05-03 00:15:47.000000000 +0200 
    6446 +++ linux-2.6/drivers/char/Makefile     2008-03-09 15:14:46.000000000 +0200 
     6395--- a/drivers/char/Makefile 
     6396+++ b/drivers/char/Makefile 
    64476397@@ -98,6 +98,8 @@ 
    64486398 obj-$(CONFIG_GPIO_VR41XX)      += vr41xx_giu.o 
     
    64546404 obj-$(CONFIG_MWAVE)            += mwave/ 
    64556405 obj-$(CONFIG_AGP)              += agp/ 
    6456 diff -urN -x CVS linux-2.6.25/drivers/char/at91_spi.c linux-2.6/drivers/char/at91_spi.c 
    6457 --- linux-2.6.25/drivers/char/at91_spi.c        1970-01-01 02:00:00.000000000 +0200 
    6458 +++ linux-2.6/drivers/char/at91_spi.c   2008-04-18 17:38:01.000000000 +0200 
     6406--- /dev/null 
     6407+++ b/drivers/char/at91_spi.c 
    64596408@@ -0,0 +1,337 @@ 
    64606409+/* 
     
    67956744+MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200") 
    67966745+MODULE_ALIAS("platform:at91_spi"); 
    6797 diff -urN -x CVS linux-2.6.25/drivers/char/at91_spidev.c linux-2.6/drivers/char/at91_spidev.c 
    6798 --- linux-2.6.25/drivers/char/at91_spidev.c     1970-01-01 02:00:00.000000000 +0200 
    6799 +++ linux-2.6/drivers/char/at91_spidev.c        2007-12-31 15:18:43.000000000 +0200 
     6746--- /dev/null 
     6747+++ b/drivers/char/at91_spidev.c 
    68006748@@ -0,0 +1,233 @@ 
    68016749+/* 
     
    70326980+MODULE_AUTHOR("Andrew Victor") 
    70336981+MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200") 
    7034 diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Kconfig linux-2.6/drivers/i2c/busses/Kconfig 
    7035 --- linux-2.6.25/drivers/i2c/busses/Kconfig     2008-05-03 00:15:47.000000000 +0200 
    7036 +++ linux-2.6/drivers/i2c/busses/Kconfig        2008-04-02 22:11:28.000000000 +0200 
     6982--- a/drivers/i2c/busses/Kconfig 
     6983+++ b/drivers/i2c/busses/Kconfig 
    70376984@@ -88,6 +88,14 @@ 
    70386985          to support combined I2C messages.  Use the i2c-gpio driver 
     
    70657012        tristate "PCA9564 on an ISA bus" 
    70667013        depends on ISA 
    7067 diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/Makefile linux-2.6/drivers/i2c/busses/Makefile 
    7068 --- linux-2.6.25/drivers/i2c/busses/Makefile    2008-05-03 00:15:47.000000000 +0200 
    7069 +++ linux-2.6/drivers/i2c/busses/Makefile       2008-03-09 15:14:46.000000000 +0200 
     7014--- a/drivers/i2c/busses/Makefile 
     7015+++ b/drivers/i2c/busses/Makefile 
    70707016@@ -29,6 +29,7 @@ 
    70717017 obj-$(CONFIG_I2C_PARPORT)      += i2c-parport.o 
     
    70767022 obj-$(CONFIG_I2C_PIIX4)                += i2c-piix4.o 
    70777023 obj-$(CONFIG_I2C_PMCMSP)       += i2c-pmcmsp.o 
    7078 diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-at91.c linux-2.6/drivers/i2c/busses/i2c-at91.c 
    7079 --- linux-2.6.25/drivers/i2c/busses/i2c-at91.c  2008-05-03 00:15:35.000000000 +0200 
    7080 +++ linux-2.6/drivers/i2c/busses/i2c-at91.c     2008-01-16 13:15:34.000000000 +0200 
     7024--- a/drivers/i2c/busses/i2c-at91.c 
     7025+++ b/drivers/i2c/busses/i2c-at91.c 
    70817026@@ -31,8 +31,11 @@ 
    70827027 #include <asm/arch/board.h> 
     
    71197064  
    71207065        at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv); 
    7121 diff -urN -x CVS linux-2.6.25/drivers/i2c/busses/i2c-pca.c linux-2.6/drivers/i2c/busses/i2c-pca.c 
    7122 --- linux-2.6.25/drivers/i2c/busses/i2c-pca.c   1970-01-01 02:00:00.000000000 +0200 
    7123 +++ linux-2.6/drivers/i2c/busses/i2c-pca.c      2007-12-31 15:18:43.000000000 +0200 
     7066--- /dev/null 
     7067+++ b/drivers/i2c/busses/i2c-pca.c 
    71247068@@ -0,0 +1,213 @@ 
    71257069+/* 
     
    73367280+MODULE_DESCRIPTION("PCA9564 platform driver"); 
    73377281+MODULE_LICENSE("GPL"); 
    7338 diff -urN -x CVS linux-2.6.25/drivers/mmc/host/at91_mci.c linux-2.6/drivers/mmc/host/at91_mci.c 
    7339 --- linux-2.6.25/drivers/mmc/host/at91_mci.c    2008-05-03 00:15:48.000000000 +0200 
    7340 +++ linux-2.6/drivers/mmc/host/at91_mci.c       2008-04-18 17:32:40.000000000 +0200 
     7282--- a/drivers/mmc/host/at91_mci.c 
     7283+++ b/drivers/mmc/host/at91_mci.c 
    73417284@@ -659,13 +659,14 @@ 
    73427285        /* maybe switch power to the card */ 
     
    73617304        } 
    73627305 } 
    7363 diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/Kconfig linux-2.6/drivers/mtd/devices/Kconfig 
    7364 --- linux-2.6.25/drivers/mtd/devices/Kconfig    2008-05-03 00:15:36.000000000 +0200 
    7365 +++ linux-2.6/drivers/mtd/devices/Kconfig       2007-12-31 10:44:25.000000000 +0200 
     7306--- a/drivers/mtd/devices/Kconfig 
     7307+++ b/drivers/mtd/devices/Kconfig 
    73667308@@ -270,5 +270,17 @@ 
    73677309          LinuxBIOS or if you need to recover a DiskOnChip Millennium on which 
     
    73837325  
    73847326+endmenu 
    7385 diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/Makefile linux-2.6/drivers/mtd/devices/Makefile 
    7386 --- linux-2.6.25/drivers/mtd/devices/Makefile   2008-05-03 00:15:36.000000000 +0200 
    7387 +++ linux-2.6/drivers/mtd/devices/Makefile      2007-12-31 10:48:27.000000000 +0200 
     7327--- a/drivers/mtd/devices/Makefile 
     7328+++ b/drivers/mtd/devices/Makefile 
    73887329@@ -17,3 +17,4 @@ 
    73897330 obj-$(CONFIG_MTD_BLOCK2MTD)    += block2mtd.o 
     
    73917332 obj-$(CONFIG_MTD_M25P80)       += m25p80.o 
    73927333+obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o 
    7393 diff -urN -x CVS linux-2.6.25/drivers/mtd/devices/at91_dataflash.c linux-2.6/drivers/mtd/devices/at91_dataflash.c 
    7394 --- linux-2.6.25/drivers/mtd/devices/at91_dataflash.c   1970-01-01 02:00:00.000000000 +0200 
    7395 +++ linux-2.6/drivers/mtd/devices/at91_dataflash.c      2007-12-31 15:18:43.000000000 +0200 
     7334--- /dev/null 
     7335+++ b/drivers/mtd/devices/at91_dataflash.c 
    73967336@@ -0,0 +1,673 @@ 
    73977337+/* 
     
    80688008+MODULE_AUTHOR("Andrew Victor"); 
    80698009+MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200"); 
    8070 diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/Kconfig linux-2.6/drivers/mtd/nand/Kconfig 
    8071 --- linux-2.6.25/drivers/mtd/nand/Kconfig       2008-05-03 00:15:48.000000000 +0200 
    8072 +++ linux-2.6/drivers/mtd/nand/Kconfig  2008-04-18 17:52:53.000000000 +0200 
     8010--- a/drivers/mtd/nand/Kconfig 
     8011+++ b/drivers/mtd/nand/Kconfig 
    80738012@@ -273,12 +273,53 @@ 
    80748013          If you say "m", the module will be called "cs553x_nand.ko". 
     
    81268065        tristate "Support for NAND Flash on CM-X270 modules" 
    81278066        depends on MTD_NAND && MACH_ARMCORE 
    8128 diff -urN -x CVS linux-2.6.25/drivers/mtd/nand/at91_nand.c linux-2.6/drivers/mtd/nand/at91_nand.c 
    8129 --- linux-2.6.25/drivers/mtd/nand/at91_nand.c   2008-05-03 00:15:48.000000000 +0200 
    8130 +++ linux-2.6/drivers/mtd/nand/at91_nand.c      2008-05-03 00:53:39.000000000 +0200 
     8067--- a/drivers/mtd/nand/at91_nand.c 
     8068+++ b/drivers/mtd/nand/at91_nand.c 
    81318069@@ -9,6 +9,15 @@ 
    81328070  *  Derived from drivers/mtd/spia.c 
     
    86788616-MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200"); 
    86798617+MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200 / AT91SAM9 / AT91CAP9"); 
    8680 diff -urN -x CVS linux-2.6.25/drivers/net/arm/Kconfig linux-2.6/drivers/net/arm/Kconfig 
    8681 --- linux-2.6.25/drivers/net/arm/Kconfig        2007-10-09 22:31:38.000000000 +0200 
    8682 +++ linux-2.6/drivers/net/arm/Kconfig   2008-03-04 21:52:40.000000000 +0200 
     8618--- a/drivers/net/arm/Kconfig 
     8619+++ b/drivers/net/arm/Kconfig 
    86838620@@ -47,3 +47,10 @@ 
    86848621        help 
     
    86928629+         If you wish to compile a kernel for an KS8695-based board 
    86938630+         and enable Ethernet support, then select this option. 
    8694 diff -urN -x CVS linux-2.6.25/drivers/net/arm/Makefile linux-2.6/drivers/net/arm/Makefile 
    8695 --- linux-2.6.25/drivers/net/arm/Makefile       2007-10-09 22:31:38.000000000 +0200 
    8696 +++ linux-2.6/drivers/net/arm/Makefile  2008-03-04 21:51:41.000000000 +0200 
     8631--- a/drivers/net/arm/Makefile 
     8632+++ b/drivers/net/arm/Makefile 
    86978633@@ -9,3 +9,4 @@ 
    86988634 obj-$(CONFIG_ARM_ETHER1)       += ether1.o 
     
    87008636 obj-$(CONFIG_EP93XX_ETH)       += ep93xx_eth.o 
    87018637+obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695_ether.o 
    8702 diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.c linux-2.6/drivers/net/arm/at91_ether.c 
    8703 --- linux-2.6.25/drivers/net/arm/at91_ether.c   2008-05-03 00:15:48.000000000 +0200 
    8704 +++ linux-2.6/drivers/net/arm/at91_ether.c      2008-05-08 21:47:22.000000000 +0200 
     8638--- a/drivers/net/arm/at91_ether.c 
     8639+++ b/drivers/net/arm/at91_ether.c 
    87058640@@ -220,7 +220,7 @@ 
    87068641                if (!(phy & (1 << 0))) 
     
    88938828 MODULE_AUTHOR("Andrew Victor"); 
    88948829+MODULE_ALIAS("platform:" DRV_NAME); 
    8895 diff -urN -x CVS linux-2.6.25/drivers/net/arm/at91_ether.h linux-2.6/drivers/net/arm/at91_ether.h 
    8896 --- linux-2.6.25/drivers/net/arm/at91_ether.h   2007-10-09 22:31:38.000000000 +0200 
    8897 +++ linux-2.6/drivers/net/arm/at91_ether.h      2008-05-08 21:47:31.000000000 +0200 
     8830--- a/drivers/net/arm/at91_ether.h 
     8831+++ b/drivers/net/arm/at91_ether.h 
    88988832@@ -48,6 +48,9 @@ 
    88998833 /* Altima AC101L PHY */ 
     
    89148848        struct at91_eth_data board_data;        /* board-specific configuration */ 
    89158849        struct clk *ether_clk;                  /* clock */ 
    8916 diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.c linux-2.6/drivers/net/arm/ks8695_ether.c 
    8917 --- linux-2.6.25/drivers/net/arm/ks8695_ether.c 1970-01-01 02:00:00.000000000 +0200 
    8918 +++ linux-2.6/drivers/net/arm/ks8695_ether.c    2008-05-08 21:52:35.000000000 +0200 
     8850--- /dev/null 
     8851+++ b/drivers/net/arm/ks8695_ether.c 
    89198852@@ -0,0 +1,1009 @@ 
    89208853+/* 
     
    99279860+MODULE_AUTHOR("Andrew Victor"); 
    99289861+MODULE_ALIAS("platform:" DRV_NAME); 
    9929 diff -urN -x CVS linux-2.6.25/drivers/net/arm/ks8695_ether.h linux-2.6/drivers/net/arm/ks8695_ether.h 
    9930 --- linux-2.6.25/drivers/net/arm/ks8695_ether.h 1970-01-01 02:00:00.000000000 +0200 
    9931 +++ linux-2.6/drivers/net/arm/ks8695_ether.h    2008-05-08 21:51:23.000000000 +0200 
     9862--- /dev/null 
     9863+++ b/drivers/net/arm/ks8695_ether.h 
    99329864@@ -0,0 +1,92 @@ 
    99339865+/* 
     
    100239955+ 
    100249956+#endif 
    10025 diff -urN -x CVS linux-2.6.25/drivers/rtc/Kconfig linux-2.6/drivers/rtc/Kconfig 
    10026 --- linux-2.6.25/drivers/rtc/Kconfig    2008-05-03 00:15:49.000000000 +0200 
    10027 +++ linux-2.6/drivers/rtc/Kconfig       2008-04-15 21:48:11.000000000 +0200 
     9957--- a/drivers/rtc/Kconfig 
     9958+++ b/drivers/rtc/Kconfig 
    100289959@@ -487,12 +487,12 @@ 
    100299960          this is powered by the backup power supply. 
     
    100439974          (On AT91SAM9rl chips you probably want to use the dedicated RTC 
    100449975          module and leave the RTT available for other uses.) 
    10045 diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91rm9200.c linux-2.6/drivers/rtc/rtc-at91rm9200.c 
    10046 --- linux-2.6.25/drivers/rtc/rtc-at91rm9200.c   2008-05-03 00:15:49.000000000 +0200 
    10047 +++ linux-2.6/drivers/rtc/rtc-at91rm9200.c      2008-04-25 23:15:05.000000000 +0200 
     9976--- a/drivers/rtc/rtc-at91rm9200.c 
     9977+++ b/drivers/rtc/rtc-at91rm9200.c 
    100489978@@ -29,9 +29,6 @@ 
    100499979 #include <linux/completion.h> 
     
    100699999                                &at91_rtc_ops, THIS_MODULE); 
    1007010000        if (IS_ERR(rtc)) { 
    10071 diff -urN -x CVS linux-2.6.25/drivers/rtc/rtc-at91sam9.c linux-2.6/drivers/rtc/rtc-at91sam9.c 
    10072 --- linux-2.6.25/drivers/rtc/rtc-at91sam9.c     2008-05-03 00:15:49.000000000 +0200 
    10073 +++ linux-2.6/drivers/rtc/rtc-at91sam9.c        2008-05-05 22:01:39.000000000 +0200 
     10001--- a/drivers/rtc/rtc-at91sam9.c 
     10002+++ b/drivers/rtc/rtc-at91sam9.c 
    1007410003@@ -21,6 +21,7 @@ 
    1007510004  
     
    1011110040        rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS); 
    1011210041        rtc->rtt += r->start; 
    10113 diff -urN -x CVS linux-2.6.25/drivers/spi/Kconfig linux-2.6/drivers/spi/Kconfig 
    10114 --- linux-2.6.25/drivers/spi/Kconfig    2008-05-03 00:15:50.000000000 +0200 
    10115 +++ linux-2.6/drivers/spi/Kconfig       2008-03-09 15:14:53.000000000 +0200 
    10116 @@ -105,6 +105,15 @@ 
    10117           inexpensive battery powered microcontroller evaluation board. 
    10118           This same cable can be used to flash new firmware. 
     10042--- a/drivers/spi/Kconfig 
     10043+++ b/drivers/spi/Kconfig 
     10044@@ -113,6 +113,15 @@ 
     10045  
     10046          If unsure, say N. 
    1011910047  
    1012010048+config SPI_AT91 
     
    1013010058        tristate "Freescale iMX SPI controller" 
    1013110059        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL 
    10132 diff -urN -x CVS linux-2.6.25/drivers/spi/Makefile linux-2.6/drivers/spi/Makefile 
    10133 --- linux-2.6.25/drivers/spi/Makefile   2008-05-03 00:15:50.000000000 +0200 
    10134 +++ linux-2.6/drivers/spi/Makefile      2008-03-09 17:54:27.000000000 +0200 
     10060--- a/drivers/spi/Makefile 
     10061+++ b/drivers/spi/Makefile 
    1013510062@@ -29,6 +29,7 @@ 
    1013610063 obj-$(CONFIG_SPI_TXX9)                 += spi_txx9.o 
     
    1014110068  
    1014210069 # SPI protocol drivers (device/link on bus) 
    10143 diff -urN -x CVS linux-2.6.25/drivers/spi/spi_at91_bitbang.c linux-2.6/drivers/spi/spi_at91_bitbang.c 
    10144 --- linux-2.6.25/drivers/spi/spi_at91_bitbang.c 1970-01-01 02:00:00.000000000 +0200 
    10145 +++ linux-2.6/drivers/spi/spi_at91_bitbang.c    2008-04-18 17:38:19.000000000 +0200 
     10070--- /dev/null 
     10071+++ b/drivers/spi/spi_at91_bitbang.c 
    1014610072@@ -0,0 +1,208 @@ 
    1014710073+/* 
     
    1035310279+MODULE_LICENSE("GPL"); 
    1035410280+MODULE_ALIAS("platform:at91_spi"); 
    10355 diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/Kconfig linux-2.6/drivers/usb/gadget/Kconfig 
    10356 --- linux-2.6.25/drivers/usb/gadget/Kconfig     2008-05-03 00:15:50.000000000 +0200 
    10357 +++ linux-2.6/drivers/usb/gadget/Kconfig        2008-04-18 19:23:34.000000000 +0200 
     10281--- a/drivers/usb/gadget/Kconfig 
     10282+++ b/drivers/usb/gadget/Kconfig 
    1035810283@@ -118,10 +118,10 @@ 
    1035910284 config USB_GADGET_ATMEL_USBA 
     
    1036910294 config USB_ATMEL_USBA 
    1037010295        tristate 
    10371 diff -urN -x CVS linux-2.6.25/drivers/usb/gadget/at91_udc.c linux-2.6/drivers/usb/gadget/at91_udc.c 
    10372 --- linux-2.6.25/drivers/usb/gadget/at91_udc.c  2008-05-03 00:15:50.000000000 +0200 
    10373 +++ linux-2.6/drivers/usb/gadget/at91_udc.c     2008-04-15 21:48:12.000000000 +0200 
     10296--- a/drivers/usb/gadget/at91_udc.c 
     10297+++ b/drivers/usb/gadget/at91_udc.c 
    1037410298@@ -1827,7 +1827,7 @@ 
    1037510299         */ 
     
    1038110305                wake = 0; 
    1038210306        } else 
    10383 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 
    10384 --- linux-2.6.25/drivers/usb/gadget/atmel_usba_udc.c    2008-05-03 00:15:50.000000000 +0200 
    10385 +++ linux-2.6/drivers/usb/gadget/atmel_usba_udc.c       2008-05-03 01:07:46.000000000 +0200 
     10307--- a/drivers/usb/gadget/atmel_usba_udc.c 
     10308+++ b/drivers/usb/gadget/atmel_usba_udc.c 
    1038610309@@ -18,6 +18,7 @@ 
    1038710310 #include <linux/platform_device.h> 
     
    1063410557        usba_cleanup_debugfs(udc); 
    1063510558  
    10636 diff -urN -x CVS linux-2.6.25/drivers/usb/host/ohci-at91.c linux-2.6/drivers/usb/host/ohci-at91.c 
    10637 --- linux-2.6.25/drivers/usb/host/ohci-at91.c   2008-05-03 00:15:50.000000000 +0200 
    10638 +++ linux-2.6/drivers/usb/host/ohci-at91.c      2008-04-15 21:48:12.000000000 +0200 
     10559--- a/drivers/usb/host/ohci-at91.c 
     10560+++ b/drivers/usb/host/ohci-at91.c 
    1063910561@@ -330,7 +330,7 @@ 
    1064010562         * 
     
    1064610568                at91_stop_clock(); 
    1064710569        } 
    10648 diff -urN -x CVS linux-2.6.25/drivers/video/Kconfig linux-2.6/drivers/video/Kconfig 
    10649 --- linux-2.6.25/drivers/video/Kconfig  2008-05-03 00:15:50.000000000 +0200 
    10650 +++ linux-2.6/drivers/video/Kconfig     2008-04-02 22:11:30.000000000 +0200 
     10570--- a/drivers/video/Kconfig 
     10571+++ b/drivers/video/Kconfig 
    1065110572@@ -889,6 +889,17 @@ 
    1065210573          framebuffer.  Product specs at 
     
    1066710588        tristate "Epson S1D13XXX framebuffer support" 
    1066810589        depends on FB 
    10669 diff -urN -x CVS linux-2.6.25/drivers/video/Makefile linux-2.6/drivers/video/Makefile 
    10670 --- linux-2.6.25/drivers/video/Makefile 2008-05-03 00:15:50.000000000 +0200 
    10671 +++ linux-2.6/drivers/video/Makefile    2008-04-02 22:11:30.000000000 +0200 
     10590--- a/drivers/video/Makefile 
     10591+++ b/drivers/video/Makefile 
    1067210592@@ -87,7 +87,8 @@ 
    1067310593 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o 
     
    1068010600 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o 
    1068110601 obj-$(CONFIG_FB_ARMCLCD)         += amba-clcd.o 
    10682 diff -urN -x CVS linux-2.6.25/drivers/video/atmel_lcdfb.c linux-2.6/drivers/video/atmel_lcdfb.c 
    10683 --- linux-2.6.25/drivers/video/atmel_lcdfb.c    2008-05-03 00:15:50.000000000 +0200 
    10684 +++ linux-2.6/drivers/video/atmel_lcdfb.c       2008-04-03 00:27:47.000000000 +0200 
     10602--- a/drivers/video/atmel_lcdfb.c 
     10603+++ b/drivers/video/atmel_lcdfb.c 
    1068510604@@ -31,7 +31,7 @@ 
    1068610605 #define ATMEL_LCDC_CVAL_DEFAULT                0xc8 
     
    1074110660                .name   = "atmel_lcdfb", 
    1074210661                .owner  = THIS_MODULE, 
    10743 diff -urN -x CVS linux-2.6.25/drivers/video/backlight/Kconfig linux-2.6/drivers/video/backlight/Kconfig 
    10744 --- linux-2.6.25/drivers/video/backlight/Kconfig        2008-05-03 00:15:50.000000000 +0200 
    10745 +++ linux-2.6/drivers/video/backlight/Kconfig   2008-03-09 18:51:50.000000000 +0200 
     10662--- a/drivers/video/backlight/Kconfig 
     10663+++ b/drivers/video/backlight/Kconfig 
    1074610664@@ -112,3 +112,11 @@ 
    1074710665        help 
     
    1075610674+         If you have a KwikByte KB9202 board, say Y to enable the 
    1075710675+         backlight driver. 
    10758 diff -urN -x CVS linux-2.6.25/drivers/video/backlight/Makefile linux-2.6/drivers/video/backlight/Makefile 
    10759 --- linux-2.6.25/drivers/video/backlight/Makefile       2008-05-03 00:15:50.000000000 +0200 
    10760 +++ linux-2.6/drivers/video/backlight/Makefile  2008-03-09 15:14:55.000000000 +0200 
     10676--- a/drivers/video/backlight/Makefile 
     10677+++ b/drivers/video/backlight/Makefile 
    1076110678@@ -10,3 +10,4 @@ 
    1076210679 obj-$(CONFIG_BACKLIGHT_OMAP1)  += omap1_bl.o 
     
    1076410681 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o 
    1076510682+obj-$(CONFIG_BACKLIGHT_KB920x) += kb920x_bl.o 
    10766 diff -urN -x CVS linux-2.6.25/drivers/video/backlight/kb920x_bl.c linux-2.6/drivers/video/backlight/kb920x_bl.c 
    10767 --- linux-2.6.25/drivers/video/backlight/kb920x_bl.c    1970-01-01 02:00:00.000000000 +0200 
    10768 +++ linux-2.6/drivers/video/backlight/kb920x_bl.c       2008-03-09 21:41:20.000000000 +0200 
     10683--- /dev/null 
     10684+++ b/drivers/video/backlight/kb920x_bl.c 
    1076910685@@ -0,0 +1,164 @@ 
    1077010686+/* 
     
    1093210848+MODULE_DESCRIPTION("KB9202 Backlight Driver"); 
    1093310849+MODULE_LICENSE("GPL"); 
    10934 diff -urN -x CVS linux-2.6.25/drivers/video/s1d15605fb.c linux-2.6/drivers/video/s1d15605fb.c 
    10935 --- linux-2.6.25/drivers/video/s1d15605fb.c     1970-01-01 02:00:00.000000000 +0200 
    10936 +++ linux-2.6/drivers/video/s1d15605fb.c        2008-05-03 00:36:04.000000000 +0200 
     10850--- /dev/null 
     10851+++ b/drivers/video/s1d15605fb.c 
    1093710852@@ -0,0 +1,655 @@ 
    1093810853+/* 
     
    1159111506+MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver"); 
    1159211507+MODULE_LICENSE("GPL"); 
    11593 diff -urN -x CVS linux-2.6.25/drivers/watchdog/Kconfig linux-2.6/drivers/watchdog/Kconfig 
    11594 --- linux-2.6.25/drivers/watchdog/Kconfig       2008-05-03 00:15:50.000000000 +0200 
    11595 +++ linux-2.6/drivers/watchdog/Kconfig  2008-03-09 15:14:55.000000000 +0200 
     11508--- a/drivers/watchdog/Kconfig 
     11509+++ b/drivers/watchdog/Kconfig 
    1159611510@@ -66,6 +66,14 @@ 
    1159711511          Watchdog timer embedded into AT91RM9200 chips. This will reboot your 
     
    1160911523        tristate "DC21285 watchdog" 
    1161011524        depends on FOOTBRIDGE 
    11611 diff -urN -x CVS linux-2.6.25/drivers/watchdog/Makefile linux-2.6/drivers/watchdog/Makefile 
    11612 --- linux-2.6.25/drivers/watchdog/Makefile      2008-05-03 00:15:50.000000000 +0200 
    11613 +++ linux-2.6/drivers/watchdog/Makefile 2008-03-09 15:14:55.000000000 +0200 
     11525--- a/drivers/watchdog/Makefile 
     11526+++ b/drivers/watchdog/Makefile 
    1161411527@@ -26,6 +26,7 @@ 
    1161511528  
     
    1162011533 obj-$(CONFIG_21285_WATCHDOG) += wdt285.o 
    1162111534 obj-$(CONFIG_977_WATCHDOG) += wdt977.o 
    11622 diff -urN -x CVS linux-2.6.25/drivers/watchdog/at91sam9_wdt.c linux-2.6/drivers/watchdog/at91sam9_wdt.c 
    11623 --- linux-2.6.25/drivers/watchdog/at91sam9_wdt.c        1970-01-01 02:00:00.000000000 +0200 
    11624 +++ linux-2.6/drivers/watchdog/at91sam9_wdt.c   2008-04-15 21:53:41.000000000 +0200 
     11535--- /dev/null 
     11536+++ b/drivers/watchdog/at91sam9_wdt.c 
    1162511537@@ -0,0 +1,259 @@ 
    1162611538+/* 
     
    1188311795+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 
    1188411796+MODULE_ALIAS("platform:at91_wdt"); 
    11885 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 
    11886 --- linux-2.6.25/include/asm-arm/arch-at91/at91_ecc.h   2007-10-09 22:31:38.000000000 +0200 
    11887 +++ linux-2.6/include/asm-arm/arch-at91/at91_ecc.h      2008-05-07 23:49:32.000000000 +0200 
     11797--- a/include/asm-arm/arch-at91/at91_ecc.h 
     11798+++ b/include/asm-arm/arch-at91/at91_ecc.h 
    1188811799@@ -1,6 +1,9 @@ 
    1188911800 /* 
     
    1192811839  
    1192911840 #endif 
    11930 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 
    11931 --- linux-2.6.25/include/asm-arm/arch-at91/at91_pit.h   2007-10-09 22:31:38.000000000 +0200 
    11932 +++ linux-2.6/include/asm-arm/arch-at91/at91_pit.h      2008-05-07 23:49:57.000000000 +0200 
     11841--- a/include/asm-arm/arch-at91/at91_pit.h 
     11842+++ b/include/asm-arm/arch-at91/at91_pit.h 
    1193311843@@ -1,6 +1,9 @@ 
    1193411844 /* 
     
    1194111851  * Based on AT91SAM9261 datasheet revision D. 
    1194211852  * 
    11943 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 
    11944 --- linux-2.6.25/include/asm-arm/arch-at91/at91_pmc.h   2008-05-03 00:15:51.000000000 +0200 
    11945 +++ linux-2.6/include/asm-arm/arch-at91/at91_pmc.h      2008-05-05 22:01:39.000000000 +0200 
     11853--- a/include/asm-arm/arch-at91/at91_pmc.h 
     11854+++ b/include/asm-arm/arch-at91/at91_pmc.h 
    1194611855@@ -23,6 +23,7 @@ 
    1194711856 #define                AT91_PMC_PCK            (1 <<  0)               /* Processor Clock */ 
     
    1201211921+ 
    1201311922 #endif 
    12014 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 
    12015 --- linux-2.6.25/include/asm-arm/arch-at91/at91_rstc.h  2007-10-09 22:31:38.000000000 +0200 
    12016 +++ linux-2.6/include/asm-arm/arch-at91/at91_rstc.h     2008-05-07 23:50:10.000000000 +0200 
     11923--- a/include/asm-arm/arch-at91/at91_rstc.h 
     11924+++ b/include/asm-arm/arch-at91/at91_rstc.h 
    1201711925@@ -1,6 +1,9 @@ 
    1201811926 /* 
     
    1202511933  * Based on AT91SAM9261 datasheet revision D. 
    1202611934  * 
    12027 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 
    12028 --- linux-2.6.25/include/asm-arm/arch-at91/at91_rtt.h   2008-05-03 00:15:51.000000000 +0200 
    12029 +++ linux-2.6/include/asm-arm/arch-at91/at91_rtt.h      2008-05-07 23:51:11.000000000 +0200 
     11935--- a/include/asm-arm/arch-at91/at91_rtt.h 
     11936+++ b/include/asm-arm/arch-at91/at91_rtt.h 
    1203011937@@ -1,6 +1,9 @@ 
    1203111938 /* 
     
    1203811945  * Based on AT91SAM9261 datasheet revision D. 
    1203911946  * 
    12040 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 
    12041 --- linux-2.6.25/include/asm-arm/arch-at91/at91_shdwc.h 2007-10-09 22:31:38.000000000 +0200 
    12042 +++ linux-2.6/include/asm-arm/arch-at91/at91_shdwc.h    2008-05-07 23:50:23.000000000 +0200 
     11947--- a/include/asm-arm/arch-at91/at91_shdwc.h 
     11948+++ b/include/asm-arm/arch-at91/at91_shdwc.h 
    1204311949@@ -1,6 +1,9 @@ 
    1204411950 /* 
     
    1206411970  
    1206511971 #endif 
    12066 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 
    12067 --- linux-2.6.25/include/asm-arm/arch-at91/at91_tsc.h   1970-01-01 02:00:00.000000000 +0200 
    12068 +++ linux-2.6/include/asm-arm/arch-at91/at91_tsc.h      2008-05-07 23:51:32.000000000 +0200 
     11972--- /dev/null 
     11973+++ b/include/asm-arm/arch-at91/at91_tsc.h 
    1206911974@@ -0,0 +1,76 @@ 
    1207011975+/* 
     
    1214412049+#endif 
    1214512050+ 
    12146 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 
    12147 --- linux-2.6.25/include/asm-arm/arch-at91/at91_wdt.h   2007-10-09 22:31:38.000000000 +0200 
    12148 +++ linux-2.6/include/asm-arm/arch-at91/at91_wdt.h      2008-05-07 23:51:43.000000000 +0200 
     12051--- a/include/asm-arm/arch-at91/at91_wdt.h 
     12052+++ b/include/asm-arm/arch-at91/at91_wdt.h 
    1214912053@@ -1,6 +1,9 @@ 
    1215012054 /* 
     
    1215712061  * Based on AT91SAM9261 datasheet revision D. 
    1215812062  * 
    12159 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 
    12160 --- linux-2.6.25/include/asm-arm/arch-at91/at91cap9.h   2008-05-03 00:15:51.000000000 +0200 
    12161 +++ linux-2.6/include/asm-arm/arch-at91/at91cap9.h      2008-05-05 22:01:39.000000000 +0200 
     12063--- a/include/asm-arm/arch-at91/at91cap9.h 
     12064+++ b/include/asm-arm/arch-at91/at91cap9.h 
    1216212065@@ -101,7 +101,10 @@ 
    1216312066 #define AT91_RTT       (0xfffffd20 - AT91_BASE_SYS) 
     
    1218112084  
    1218212085 #define CONFIG_DRAM_BASE       AT91_CHIPSELECT_6 
    12183 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 
    12184 --- linux-2.6.25/include/asm-arm/arch-at91/at91cap9_ddrsdr.h    1970-01-01 02:00:00.000000000 +0200 
    12185 +++ linux-2.6/include/asm-arm/arch-at91/at91cap9_ddrsdr.h       2008-05-07 21:33:47.000000000 +0200 
     12086--- /dev/null 
     12087+++ b/include/asm-arm/arch-at91/at91cap9_ddrsdr.h 
    1218612088@@ -0,0 +1,102 @@ 
    1218712089+/* 
     
    1228712189+ 
    1228812190+#endif 
    12289 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 
    12290 --- linux-2.6.25/include/asm-arm/arch-at91/at91cap9_matrix.h    2008-05-03 00:15:51.000000000 +0200 
    12291 +++ linux-2.6/include/asm-arm/arch-at91/at91cap9_matrix.h       2008-04-18 19:20:34.000000000 +0200 
     12191--- a/include/asm-arm/arch-at91/at91cap9_matrix.h 
     12192+++ b/include/asm-arm/arch-at91/at91cap9_matrix.h 
    1229212193@@ -106,6 +106,11 @@ 
    1229312194 #define AT91_MPBS0_SFR         (AT91_MATRIX + 0x114)   /* MPBlock Slave 0 Special Function Register */ 
     
    1230212203 #define                AT91_MATRIX_EBI_CS1A            (1 << 1)        /* Chip Select 1 Assignment */ 
    1230312204 #define                        AT91_MATRIX_EBI_CS1A_SMC                (0 << 1) 
    12304 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 
    12305 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam9260_matrix.h 2008-05-03 00:15:51.000000000 +0200 
    12306 +++ linux-2.6/include/asm-arm/arch-at91/at91sam9260_matrix.h    2008-05-07 12:07:13.000000000 +0200 
     12205--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h 
     12206+++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h 
    1230712207@@ -1,6 +1,8 @@ 
    1230812208 /* 
     
    1231412214  * Based on AT91SAM9260 datasheet revision B. 
    1231512215  * 
    12316 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 
    12317 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam9261_matrix.h 2007-10-09 22:31:38.000000000 +0200 
    12318 +++ linux-2.6/include/asm-arm/arch-at91/at91sam9261_matrix.h    2008-05-07 12:07:24.000000000 +0200 
     12216--- a/include/asm-arm/arch-at91/at91sam9261_matrix.h 
     12217+++ b/include/asm-arm/arch-at91/at91sam9261_matrix.h 
    1231912218@@ -1,6 +1,8 @@ 
    1232012219 /* 
     
    1232612225  * Based on AT91SAM9261 datasheet revision D. 
    1232712226  * 
    12328 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 
    12329 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam926x_mc.h     2007-10-09 22:31:38.000000000 +0200 
    12330 +++ linux-2.6/include/asm-arm/arch-at91/at91sam926x_mc.h        1970-01-01 02:00:00.000000000 +0200 
     12227--- a/include/asm-arm/arch-at91/at91sam926x_mc.h 
     12228+++ /dev/null 
    1233112229@@ -1,141 +0,0 @@ 
    1233212230-/* 
     
    1247112369- 
    1247212370-#endif 
    12473 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 
    12474 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam9_sdramc.h    1970-01-01 02:00:00.000000000 +0200 
    12475 +++ linux-2.6/include/asm-arm/arch-at91/at91sam9_sdramc.h       2008-05-07 23:51:59.000000000 +0200 
     12371--- /dev/null 
     12372+++ b/include/asm-arm/arch-at91/at91sam9_sdramc.h 
    1247612373@@ -0,0 +1,86 @@ 
    1247712374+/* 
     
    1256112458+ 
    1256212459+#endif 
    12563 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 
    12564 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam9_smc.h       1970-01-01 02:00:00.000000000 +0200 
    12565 +++ linux-2.6/include/asm-arm/arch-at91/at91sam9_smc.h  2008-05-07 23:52:15.000000000 +0200 
     12460--- /dev/null 
     12461+++ b/include/asm-arm/arch-at91/at91sam9_smc.h 
    1256612462@@ -0,0 +1,76 @@ 
    1256712463+/* 
     
    1264112537+ 
    1264212538+#endif 
    12643 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 
    12644 --- linux-2.6.25/include/asm-arm/arch-at91/at91sam9rl.h 2008-05-03 00:15:51.000000000 +0200 
    12645 +++ linux-2.6/include/asm-arm/arch-at91/at91sam9rl.h    2008-04-18 19:22:02.000000000 +0200 
     12539--- a/include/asm-arm/arch-at91/at91sam9rl.h 
     12540+++ b/include/asm-arm/arch-at91/at91sam9rl.h 
    1264612541@@ -110,6 +110,6 @@ 
    1264712542 #define AT91SAM9RL_ROM_SIZE    (2 * SZ_16K)    /* Internal ROM size (32Kb) */ 
     
    1265212547  
    1265312548 #endif 
    12654 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 
    12655 --- linux-2.6.25/include/asm-arm/arch-at91/board.h      2008-05-03 00:15:51.000000000 +0200 
    12656 +++ linux-2.6/include/asm-arm/arch-at91/board.h 2008-05-02 00:40:32.000000000 +0200 
     12549--- a/include/asm-arm/arch-at91/board.h 
     12550+++ b/include/asm-arm/arch-at91/board.h 
    1265712551@@ -36,6 +36,7 @@ 
    1265812552 #include <linux/i2c.h> 
     
    1268312577 extern void __init at91_init_leds(u8 cpu_led, u8 timer_led); 
    1268412578 extern void __init at91_gpio_leds(struct gpio_led *leds, int nr); 
    12685 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 
    12686 --- linux-2.6.25/include/asm-arm/arch-at91/cpu.h        2008-05-03 00:15:51.000000000 +0200 
    12687 +++ linux-2.6/include/asm-arm/arch-at91/cpu.h   2008-05-05 22:10:58.000000000 +0200 
     12579--- a/include/asm-arm/arch-at91/cpu.h 
     12580+++ b/include/asm-arm/arch-at91/cpu.h 
    1268812581@@ -48,6 +48,17 @@ 
    1268912582        return (at91_sys_read(AT91_DBGU_CIDR) & AT91_CIDR_ARCH); 
     
    1271712610  
    1271812611 /* 
    12719 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 
    12720 --- linux-2.6.25/include/asm-arm/arch-at91/ics1523.h    1970-01-01 02:00:00.000000000 +0200 
    12721 +++ linux-2.6/include/asm-arm/arch-at91/ics1523.h       2008-01-16 21:24:29.000000000 +0200 
     12612--- /dev/null 
     12613+++ b/include/asm-arm/arch-at91/ics1523.h 
    1272212614@@ -0,0 +1,154 @@ 
    1272312615+//*---------------------------------------------------------------------------- 
     
    1287512767+ 
    1287612768+#endif /* ics1523_h */ 
    12877 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 
    12878 --- linux-2.6.25/include/asm-arm/arch-at91/spi.h        1970-01-01 02:00:00.000000000 +0200 
    12879 +++ linux-2.6/include/asm-arm/arch-at91/spi.h   2008-01-16 21:24:29.000000000 +0200 
     12769--- /dev/null 
     12770+++ b/include/asm-arm/arch-at91/spi.h 
    1288012771@@ -0,0 +1,54 @@ 
    1288112772+/* 
     
    1293312824+ 
    1293412825+#endif 
    12935 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 
    12936 --- linux-2.6.25/include/asm-arm/arch-at91/timex.h      2008-05-03 00:15:51.000000000 +0200 
    12937 +++ linux-2.6/include/asm-arm/arch-at91/timex.h 2008-04-18 18:30:40.000000000 +0200 
     12826--- a/include/asm-arm/arch-at91/timex.h 
     12827+++ b/include/asm-arm/arch-at91/timex.h 
    1293812828@@ -27,14 +27,29 @@ 
    1293912829  
     
    1296712857  
    1296812858 #elif defined(CONFIG_ARCH_AT91SAM9RL) 
    12969 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 
    12970 --- linux-2.6.25/include/asm-arm/arch-ks8695/devices.h  2007-10-09 22:31:38.000000000 +0200 
    12971 +++ linux-2.6/include/asm-arm/arch-ks8695/devices.h     2007-12-31 10:44:34.000000000 +0200 
     12859--- a/include/asm-arm/arch-ks8695/devices.h 
     12860+++ b/include/asm-arm/arch-ks8695/devices.h 
    1297212861@@ -18,6 +18,11 @@ 
    1297312862 extern void __init ks8695_add_device_lan(void); 
     
    1298212871 #define KS8695_MODE_PCI                0 
    1298312872 #define KS8695_MODE_MINIPCI    1 
    12984 diff -urN -x CVS linux-2.6.25/include/linux/clk.h linux-2.6/include/linux/clk.h 
    12985 --- linux-2.6.25/include/linux/clk.h    2007-10-09 22:31:38.000000000 +0200 
    12986 +++ linux-2.6/include/linux/clk.h       2007-12-31 10:44:34.000000000 +0200 
     12873--- a/include/linux/clk.h 
     12874+++ b/include/linux/clk.h 
    1298712875@@ -121,4 +121,24 @@ 
    1298812876  */ 
     
    1301012898+ 
    1301112899 #endif 
    13012 diff -urN -x CVS linux-2.6.25/include/linux/i2c-id.h linux-2.6/include/linux/i2c-id.h 
    13013 --- linux-2.6.25/include/linux/i2c-id.h 2008-05-03 00:15:52.000000000 +0200 
    13014 +++ linux-2.6/include/linux/i2c-id.h    2008-03-09 15:43:48.000000000 +0200 
     12900--- a/include/linux/i2c-id.h 
     12901+++ b/include/linux/i2c-id.h 
    1301512902@@ -131,6 +131,7 @@ 
    1301612903  
     
    1302112908 /* --- PowerPC on-chip adapters                                                */ 
    1302212909 #define I2C_HW_OCP             0x120000 /* IBM on-chip I2C adapter */ 
    13023 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 
    13024 --- linux-2.6.25/include/linux/usb/atmel_usba_udc.h     1970-01-01 02:00:00.000000000 +0200 
    13025 +++ linux-2.6/include/linux/usb/atmel_usba_udc.h        2008-05-03 00:31:09.000000000 +0200 
     12910--- /dev/null 
     12911+++ b/include/linux/usb/atmel_usba_udc.h 
    1302612912@@ -0,0 +1,23 @@ 
    1302712913+/* 
     
    1304812934+#endif /* __LINUX_USB_USBA_H */ 
    1304912935+ 
    13050 diff -urN -x CVS linux-2.6.25/include/video/atmel_lcdc.h linux-2.6/include/video/atmel_lcdc.h 
    13051 --- linux-2.6.25/include/video/atmel_lcdc.h     2008-05-03 00:15:53.000000000 +0200 
    13052 +++ linux-2.6/include/video/atmel_lcdc.h        2008-03-09 15:53:40.000000000 +0200 
     12936--- a/include/video/atmel_lcdc.h 
     12937+++ b/include/video/atmel_lcdc.h 
    1305312938@@ -39,6 +39,7 @@ 
    1305412939        u8                      bl_power; 
     
    1305912944        u8                      default_bpp; 
    1306012945        unsigned int            default_lcdcon2; 
    13061 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 
    13062 --- linux-2.6.25/sound/soc/at91/eti_b1_wm8731.c 2008-05-03 00:15:56.000000000 +0200 
    13063 +++ linux-2.6/sound/soc/at91/eti_b1_wm8731.c    2008-03-09 15:15:07.000000000 +0200 
     12946--- a/sound/soc/at91/eti_b1_wm8731.c 
     12947+++ b/sound/soc/at91/eti_b1_wm8731.c 
    1306412948@@ -33,8 +33,7 @@ 
    1306512949 #include <sound/soc.h> 
     
    1312013004        /* 
    1312113005         * Set PCK1 parent to PLLB and its rate to 12 Mhz. 
    13122 diff -urN -x CVS linux-2.6.25/sound/spi/at73c213.c linux-2.6/sound/spi/at73c213.c 
    13123 --- linux-2.6.25/sound/spi/at73c213.c   2008-05-03 00:15:56.000000000 +0200 
    13124 +++ linux-2.6/sound/spi/at73c213.c      2008-03-09 15:15:07.000000000 +0200 
     13006--- a/sound/spi/at73c213.c 
     13007+++ b/sound/spi/at73c213.c 
    1312513008@@ -114,7 +114,11 @@ 
    1312613009 static struct snd_pcm_hardware snd_at73c213_playback_hw = { 
  • trunk/target/linux/at91/patches-2.6.25/001-vlink-machine.patch

    r11631 r11933  
    1 --- linux-2.6.25.10.n/arch/arm/mach-at91/Kconfig        2008-07-04 13:07:01.000000000 +0200 
    2 +++ linux-2.6.25.10/arch/arm/mach-at91/Kconfig  2008-07-03 13:44:35.000000000 +0200 
     1--- a/arch/arm/mach-at91/Kconfig 
     2+++ b/arch/arm/mach-at91/Kconfig 
    33@@ -151,6 +151,12 @@ 
    44        help 
     
    1414  
    1515 # ---------------------------------------------------------- 
    16 --- linux-2.6.25.10.n/arch/arm/mach-at91/Makefile       2008-07-04 13:05:05.000000000 +0200 
    17 +++ linux-2.6.25.10/arch/arm/mach-at91/Makefile 2008-07-03 13:44:35.000000000 +0200 
     16--- a/arch/arm/mach-at91/Makefile 
     17+++ b/arch/arm/mach-at91/Makefile 
    1818@@ -29,6 +29,7 @@ 
    1919 obj-$(CONFIG_MACH_ATEB9200)    += board-eb9200.o 
     
    2424 obj-$(CONFIG_MACH_HOMEMATIC)   += board-homematic.o 
    2525 obj-$(CONFIG_MACH_ECBAT91)     += board-ecbat91.o 
    26 --- linux-2.6.25.10.n/arch/arm/mach-at91/board-vlink.c  2008-07-04 13:06:19.000000000 +0200 
    27 +++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c    2008-07-04 12:45:48.000000000 +0200 
     26--- /dev/null 
     27+++ b/arch/arm/mach-at91/board-vlink.c 
    2828@@ -0,0 +1,201 @@ 
    2929+/* 
  • trunk/target/linux/at91/patches-2.6.25/002-led-driver.patch

    r11745 r11933  
    1 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 
    2 --- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-06 09:01:53.000000000 +0200 
    3 +++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c     2008-07-06 09:47:54.000000000 +0200 
     1--- a/arch/arm/mach-at91/at91rm9200_devices.c 
     2+++ b/arch/arm/mach-at91/at91rm9200_devices.c 
    43@@ -717,6 +717,26 @@ 
    54 static void __init at91_add_device_watchdog(void) {} 
     
    2928 /* -------------------------------------------------------------------- 
    3029  *  SSC -- Synchronous Serial Controller 
    31 diff -urN linux-2.6.25.10.old/arch/arm/mach-at91/Makefile linux-2.6.25.10/arch/arm/mach-at91/Makefile 
    32 --- linux-2.6.25.10.old/arch/arm/mach-at91/Makefile     2008-07-06 09:01:54.000000000 +0200 
    33 +++ linux-2.6.25.10/arch/arm/mach-at91/Makefile 2008-07-06 09:45:08.000000000 +0200 
     30--- a/arch/arm/mach-at91/Makefile 
     31+++ b/arch/arm/mach-at91/Makefile 
    3432@@ -60,7 +60,12 @@ 
    3533 obj-$(CONFIG_MACH_AT91EB01)    += board-eb01.o 
     
    4644  
    4745 # Power Management 
    48 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 
    49 --- linux-2.6.25.10.old/arch/arm/mach-at91/vlink_leds.c 1970-01-01 01:00:00.000000000 +0100 
    50 +++ linux-2.6.25.10/arch/arm/mach-at91/vlink_leds.c     2008-07-06 09:40:37.000000000 +0200 
     46--- /dev/null 
     47+++ b/arch/arm/mach-at91/vlink_leds.c 
    5148@@ -0,0 +1,105 @@ 
    5249+/* 
     
    155152+ 
    156153+__initcall(leds_init); 
    157 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 
    158 --- linux-2.6.25.10.old/include/asm-arm/arch-at91/board.h       2008-07-06 09:01:54.000000000 +0200 
    159 +++ linux-2.6.25.10/include/asm-arm/arch-at91/board.h   2008-07-06 09:56:31.000000000 +0200 
     154--- a/include/asm-arm/arch-at91/board.h 
     155+++ b/include/asm-arm/arch-at91/board.h 
    160156@@ -162,6 +162,11 @@ 
    161157  /* ISI */ 
  • trunk/target/linux/at91/patches-2.6.25/003-gpio-driver.patch

    r11745 r11933  
    1 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 
    2 --- linux-2.6.25.10.old/arch/arm/mach-at91/board-vlink.c        2008-07-07 11:20:21.000000000 +0200 
    3 +++ linux-2.6.25.10/arch/arm/mach-at91/board-vlink.c    2008-07-07 12:11:40.000000000 +0200 
     1--- a/arch/arm/mach-at91/board-vlink.c 
     2+++ b/arch/arm/mach-at91/board-vlink.c 
    43@@ -99,7 +99,7 @@ 
    54 */ 
     
    104103  
    105104 MACHINE_START(VLINK, "FDL VersaLink") 
    106 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 
    107 --- linux-2.6.25.10.old/arch/arm/mach-at91/gpio.c       2008-07-07 11:20:21.000000000 +0200 
    108 +++ linux-2.6.25.10/arch/arm/mach-at91/gpio.c   2008-07-07 11:42:33.000000000 +0200 
     105--- a/arch/arm/mach-at91/gpio.c 
     106+++ b/arch/arm/mach-at91/gpio.c 
    109107@@ -29,6 +29,7 @@ 
    110108  
     
    176174  
    177175 #ifdef CONFIG_PM 
    178 diff -urN linux-2.6.25.10.old/drivers/char/Kconfig linux-2.6.25.10/drivers/char/Kconfig 
    179 --- linux-2.6.25.10.old/drivers/char/Kconfig    2008-07-07 11:20:21.000000000 +0200 
    180 +++ linux-2.6.25.10/drivers/char/Kconfig        2008-07-07 11:42:33.000000000 +0200 
     176--- a/drivers/char/Kconfig 
     177+++ b/drivers/char/Kconfig 
    181178@@ -1072,5 +1072,12 @@ 
    182179          The SPI driver gives user mode access to this serial 
     
    192189 endmenu 
    193190  
    194 diff -urN linux-2.6.25.10.old/drivers/char/Makefile linux-2.6.25.10/drivers/char/Makefile 
    195 --- linux-2.6.25.10.old/drivers/char/Makefile   2008-07-07 11:20:21.000000000 +0200 
    196 +++ linux-2.6.25.10/drivers/char/Makefile       2008-07-07 11:42:33.000000000 +0200 
     191--- a/drivers/char/Makefile 
     192+++ b/drivers/char/Makefile 
    197193@@ -100,6 +100,7 @@ 
    198194 obj-$(CONFIG_TELCLOCK)         += tlclk.o 
     
    203199 obj-$(CONFIG_MWAVE)            += mwave/ 
    204200 obj-$(CONFIG_AGP)              += agp/ 
    205 diff -urN linux-2.6.25.10.old/drivers/char/vlink_giu.c linux-2.6.25.10/drivers/char/vlink_giu.c 
    206 --- linux-2.6.25.10.old/drivers/char/vlink_giu.c        1970-01-01 01:00:00.000000000 +0100 
    207 +++ linux-2.6.25.10/drivers/char/vlink_giu.c    2008-07-07 13:41:51.000000000 +0200 
     201--- /dev/null 
     202+++ b/drivers/char/vlink_giu.c 
    208203@@ -0,0 +1,333 @@ 
    209204+/* 
     
    540535+MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>"); 
    541536+MODULE_DESCRIPTION("FDL Versalink GPIO Driver"); 
    542 +MODULE_LICENSE("GPL"); 
    543 --- linux-2.6.25.10.old/include/asm-arm/arch-at91/gpio.h        2008-07-03 05:46:47.000000000 +0200 
    544 +++ linux-2.6.25.10/include/asm-arm/arch-at91/gpio.h    2008-07-07 17:03:03.000000000 +0200 
     537--- a/include/asm-arm/arch-at91/gpio.h 
     538+++ b/include/asm-arm/arch-at91/gpio.h 
    545539@@ -199,6 +199,7 @@ 
    546540 /* callable at any time */ 
  • trunk/target/linux/at91/patches-2.6.25/007-mtd-partition.patch

    r11631 r11933  
    1 Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c 
    2 =================================================================== 
    3 --- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c 
    4 +++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c 
    5 @@ -175,7 +175,7 @@ static struct mtd_partition static_parti 
     1--- a/drivers/mtd/devices/at91_dataflash.c 
     2+++ b/drivers/mtd/devices/at91_dataflash.c 
     3@@ -175,7 +175,7 @@ 
    64 }; 
    75 #endif 
     
    1210 #endif 
    1311  
    14 Index: linux-2.6.22.19/drivers/mtd/Kconfig 
    15 =================================================================== 
    16 --- linux-2.6.22.19.orig/drivers/mtd/Kconfig 
    17 +++ linux-2.6.22.19/drivers/mtd/Kconfig 
    18 @@ -168,6 +168,12 @@ config MTD_AFS_PARTS 
    19           the partition map from the children of the flash node, 
    20           as described in Documentation/powerpc/booting-without-of.txt. 
     12--- a/drivers/mtd/Kconfig 
     13+++ b/drivers/mtd/Kconfig 
     14@@ -168,6 +168,12 @@ 
     15          the partition map from the children of the flash node, 
     16          as described in Documentation/powerpc/booting-without-of.txt. 
    2117  
    2218+config MTD_AT91_PARTS 
     
    2925  
    3026 config MTD_CHAR 
    31 Index: linux-2.6.22.19/drivers/mtd/Makefile 
    32 =================================================================== 
    33 --- linux-2.6.22.19.orig/drivers/mtd/Makefile 
    34 +++ linux-2.6.22.19/drivers/mtd/Makefile 
    35 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT)      += mtdconcat.o 
     27--- a/drivers/mtd/Makefile 
     28+++ b/drivers/mtd/Makefile 
     29@@ -12,6 +12,7 @@ 
    3630 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o 
    3731 obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o 
  • trunk/target/linux/at91/patches-2.6.25/008-fdl-serial.patch

    r11631 r11933  
    1 --- linux-2.6.25.10.old/drivers/serial/atmel_serial.c   2008-07-04 14:21:12.000000000 +0200 
    2 +++ linux-2.6.25.10/drivers/serial/atmel_serial.c       2008-07-04 14:55:37.000000000 +0200 
     1--- a/drivers/serial/atmel_serial.c 
     2+++ b/drivers/serial/atmel_serial.c 
    33@@ -214,6 +214,34 @@ 
    44                                at91_set_gpio_value(AT91_PIN_PA21, 0); 
  • trunk/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch

    r11631 r11933  
    1 --- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-04 15:04:13.000000000 +0200 
    2 +++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c     2008-07-04 15:11:44.000000000 +0200 
    3 @@ -981,7 +981,15 @@ 
     1--- a/arch/arm/mach-at91/at91rm9200_devices.c 
     2+++ b/arch/arm/mach-at91/at91rm9200_devices.c 
     3@@ -1001,7 +1001,15 @@ 
    44                 *  We need to drive the pin manually.  Default is off (RTS is active low). 
    55                 */ 
     
    1818  
    1919 static struct resource uart1_resources[] = { 
    20 @@ -1119,6 +1127,14 @@ 
     20@@ -1139,6 +1147,14 @@ 
    2121                at91_set_B_periph(AT91_PIN_PB1, 0);     /* CTS3 */ 
    2222        if (pins & ATMEL_UART_RTS) 
  • trunk/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch

    r11631 r11933  
    1 Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c 
    2 =================================================================== 
    3 --- linux-2.6.22.19.orig/drivers/net/arm/at91_ether.c 
    4 +++ linux-2.6.22.19/drivers/net/arm/at91_ether.c 
    5 @@ -146,6 +146,7 @@ static void update_linkspeed(struct net_ 
     1--- a/drivers/net/arm/at91_ether.c 
     2+++ b/drivers/net/arm/at91_ether.c 
     3@@ -146,6 +146,7 @@ 
    64        struct at91_private *lp = netdev_priv(dev); 
    75        unsigned int bmsr, bmcr, lpa, mac_cfg; 
     
    119        if (!mii_link_ok(&lp->mii)) {           /* no link */ 
    1210                netif_carrier_off(dev); 
    13 @@ -158,8 +159,15 @@ static void update_linkspeed(struct net_ 
     11@@ -158,8 +159,15 @@ 
    1412        read_phy(lp->phy_address, MII_BMSR, &bmsr); 
    1513        read_phy(lp->phy_address, MII_BMCR, &bmcr); 
  • trunk/target/linux/at91/patches-2.6.25/014-initpartition.patch

    r11631 r11933  
    1 Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c 
    2 =================================================================== 
    3 --- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c 
    4 +++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c 
    5 @@ -163,12 +163,12 @@ static struct mtd_partition static_parti 
     1--- a/drivers/mtd/devices/at91_dataflash.c 
     2+++ b/drivers/mtd/devices/at91_dataflash.c 
     3@@ -163,12 +163,12 @@ 
    64                .mask_flags     = MTD_WRITEABLE,        /* read-only */ 
    75        }, 
  • trunk/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch

    r11748 r11933  
    1 --- linux-2.6.25.10.old/drivers/usb/serial/usb-serial.c 2008-07-08 07:42:24.000000000 +0200 
    2 +++ linux-2.6.25.10/drivers/usb/serial/usb-serial.c     2008-07-08 14:07:39.000000000 +0200 
     1--- a/drivers/usb/serial/usb-serial.c 
     2+++ b/drivers/usb/serial/usb-serial.c 
    33@@ -905,7 +905,7 @@ 
    44                        dev_err(&interface->dev, "No free urbs available\n"); 
  • trunk/target/linux/au1000/Makefile

    r11667 r11933  
    1212FEATURES:=jffs2 usb pci 
    1313 
    14 LINUX_VERSION:=2.6.25.10 
     14LINUX_VERSION:=2.6.25.12 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/avr32/Makefile

    r11665 r11933  
    1111BOARDNAME:=Atmel AVR32 
    1212FEATURES:=squashfs 
    13 LINUX_VERSION:=2.6.25.10 
     13LINUX_VERSION:=2.6.25.12 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/avr32/patches/100-git_sync.patch

    r11665 r11933  
    96609660 obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o 
    96619661 obj-$(CONFIG_MMC_SPI)          += mmc_spi.o 
    9662   
     9662 obj-$(CONFIG_GPIOMMC)          += gpiommc.o 
    96639663--- /dev/null 
    96649664+++ b/drivers/mmc/host/atmel-mci.c 
     
    1471514715--- a/include/linux/fs.h 
    1471614716+++ b/include/linux/fs.h 
    14717 @@ -1691,6 +1691,8 @@ 
     14717@@ -1692,6 +1692,8 @@ 
    1471814718 extern int invalidate_inode_pages2(struct address_space *mapping); 
    1471914719 extern int invalidate_inode_pages2_range(struct address_space *mapping, 
  • trunk/target/linux/brcm47xx/Makefile

    r11667 r11933  
    1212FEATURES:=squashfs usb 
    1313 
    14 LINUX_VERSION:=2.6.25.10 
     14LINUX_VERSION:=2.6.25.12 
    1515 
    1616include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch

    r11750 r11933  
    77Signed-off-by: Michael Buesch <mb@bu3sch.de> 
    88 
    9 Index: wireless-testing/drivers/ssb/driver_pcicore.c 
    10 =================================================================== 
    11 --- wireless-testing.orig/drivers/ssb/driver_pcicore.c  2008-06-10 13:58:23.000000000 +0200 
    12 +++ wireless-testing/drivers/ssb/driver_pcicore.c       2008-07-04 23:16:02.000000000 +0200 
    13 @@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc 
     9--- a/drivers/ssb/driver_pcicore.c 
     10+++ b/drivers/ssb/driver_pcicore.c 
     11@@ -519,6 +519,13 @@ 
    1412        int err = 0; 
    1513        u32 tmp; 
  • trunk/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch

    r11907 r11933  
    11Add gpio_is_valid() for bcm47xx 
    2 Index: linux-2.6.25.10/arch/mips/bcm47xx/gpio.c 
    3 =================================================================== 
    4 --- linux-2.6.25.10.orig/arch/mips/bcm47xx/gpio.c       2008-07-20 20:48:44.000000000 +0200 
    5 +++ linux-2.6.25.10/arch/mips/bcm47xx/gpio.c    2008-07-20 20:57:55.000000000 +0200 
    6 @@ -77,3 +77,15 @@ int bcm47xx_gpio_direction_output(unsign 
     2--- a/arch/mips/bcm47xx/gpio.c 
     3+++ b/arch/mips/bcm47xx/gpio.c 
     4@@ -77,3 +77,15 @@ 
    75 } 
    86 EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output); 
     
    2018+} 
    2119+EXPORT_SYMBOL_GPL(bcm47xx_gpio_is_valid); 
    22 Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h 
    23 =================================================================== 
    24 --- linux-2.6.25.10.orig/include/asm-mips/mach-bcm47xx/gpio.h   2008-07-20 20:48:44.000000000 +0200 
    25 +++ linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h        2008-07-20 20:49:20.000000000 +0200 
    26 @@ -17,6 +17,7 @@ extern int bcm47xx_gpio_get_value(unsign 
     20--- a/include/asm-mips/mach-bcm47xx/gpio.h 
     21+++ b/include/asm-mips/mach-bcm47xx/gpio.h 
     22@@ -17,6 +17,7 @@ 
    2723 extern void bcm47xx_gpio_set_value(unsigned gpio, int value); 
    2824 extern int bcm47xx_gpio_direction_input(unsigned gpio); 
     
    3228 static inline int gpio_request(unsigned gpio, const char *label) 
    3329 { 
    34 @@ -52,6 +53,8 @@ static inline int gpio_direction_output( 
     30@@ -52,6 +53,8 @@ 
    3531        return bcm47xx_gpio_direction_output(gpio, value); 
    3632 } 
  • trunk/target/linux/brcm63xx/Makefile

    r11667 r11933  
    1111BOARDNAME:=Broadcom BCM963xx 
    1212FEATURES:=squashfs jffs2 broken usb atm 
    13 LINUX_VERSION:=2.6.25.10 
     13LINUX_VERSION:=2.6.25.12 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/etrax/Makefile

    r11667 r11933  
    1111BOARDNAME:=Foxboard (ETRAX 100LX) 
    1212FEATURES:=squashfs jffs2 broken 
    13 LINUX_VERSION:=2.6.25.10 
     13LINUX_VERSION:=2.6.25.12 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch

    r11296 r11933  
    20282028--- a/net/netfilter/nf_conntrack_core.c 
    20292029+++ b/net/netfilter/nf_conntrack_core.c 
    2030 @@ -210,6 +210,14 @@ 
     2030@@ -208,6 +208,14 @@ 
    20312031         * too. */ 
    20322032        nf_ct_remove_expectations(ct); 
  • trunk/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch

    r11894 r11933  
    1 diff -Nur a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c 
    2 --- a/drivers/mtd/devices/m25p80.c      2008-07-06 14:36:59.000000000 +0200 
    3 +++ b/drivers/mtd/devices/m25p80.c      2008-07-06 15:17:48.000000000 +0200 
    4 @@ -631,12 +631,10 @@ 
     1--- a/drivers/mtd/devices/m25p80.c 
     2+++ b/drivers/mtd/devices/m25p80.c 
     3@@ -627,12 +627,10 @@ 
    54                struct mtd_partition    *parts = NULL; 
    65                int                     nr_parts = 0; 
  • trunk/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch

    r11887 r11933  
    1 Index: linux-2.6.25.10/include/linux/spi/spi_gpio.h 
    2 =================================================================== 
    3 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4 +++ linux-2.6.25.10/include/linux/spi/spi_gpio.h        2008-07-20 20:10:21.000000000 +0200 
     1--- /dev/null 
     2+++ b/include/linux/spi/spi_gpio.h 
    53@@ -0,0 +1,73 @@ 
    64+/* 
     
    7775+ 
    7876+#endif /* _LINUX_SPI_SPI_GPIO */ 
    79 Index: linux-2.6.25.10/drivers/spi/spi_gpio.c 
    80 =================================================================== 
    81 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    82 +++ linux-2.6.25.10/drivers/spi/spi_gpio.c      2008-07-20 20:10:21.000000000 +0200 
     77--- /dev/null 
     78+++ b/drivers/spi/spi_gpio.c 
    8379@@ -0,0 +1,251 @@ 
    8480+/* 
     
    333329+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver"); 
    334330+MODULE_LICENSE("GPL v2"); 
    335 Index: linux-2.6.25.10/drivers/spi/Kconfig 
    336 =================================================================== 
    337 --- linux-2.6.25.10.orig/drivers/spi/Kconfig    2008-07-20 20:09:48.000000000 +0200 
    338 +++ linux-2.6.25.10/drivers/spi/Kconfig 2008-07-20 20:11:48.000000000 +0200 
    339 @@ -100,6 +100,19 @@ config SPI_BUTTERFLY 
     331--- a/drivers/spi/Kconfig 
     332+++ b/drivers/spi/Kconfig 
     333@@ -100,6 +100,19 @@ 
    340334          inexpensive battery powered microcontroller evaluation board. 
    341335          This same cable can be used to flash new firmware. 
     
    357351        tristate "Freescale iMX SPI controller" 
    358352        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL 
    359 Index: linux-2.6.25.10/drivers/spi/Makefile 
    360 =================================================================== 
    361 --- linux-2.6.25.10.orig/drivers/spi/Makefile   2008-07-20 20:09:48.000000000 +0200 
    362 +++ linux-2.6.25.10/drivers/spi/Makefile        2008-07-20 20:10:21.000000000 +0200 
    363 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                        += spi_bfin5xx. 
     353--- a/drivers/spi/Makefile 
     354+++ b/drivers/spi/Makefile 
     355@@ -16,6 +16,7 @@ 
    364356 obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o 
    365357 obj-$(CONFIG_SPI_AU1550)               += au1550_spi.o 
     
    369361 obj-$(CONFIG_SPI_LM70_LLP)             += spi_lm70llp.o 
    370362 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o 
    371 Index: linux-2.6.25.10/MAINTAINERS 
    372 =================================================================== 
    373 --- linux-2.6.25.10.orig/MAINTAINERS    2008-07-20 20:09:48.000000000 +0200 
    374 +++ linux-2.6.25.10/MAINTAINERS 2008-07-20 20:10:59.000000000 +0200 
    375 @@ -3685,6 +3685,11 @@ M:       dbrownell@users.sourceforge.net 
     363--- a/MAINTAINERS 
     364+++ b/MAINTAINERS 
     365@@ -3685,6 +3685,11 @@ 
    376366 L:     spi-devel-general@lists.sourceforge.net 
    377367 S:     Maintained 
  • trunk/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch

    r11887 r11933  
    1 Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c 
    2 =================================================================== 
    3 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4 +++ linux-2.6.25.10/drivers/mmc/host/gpiommc.c  2008-07-20 20:49:16.000000000 +0200 
     1--- /dev/null 
     2+++ b/drivers/mmc/host/gpiommc.c 
    53@@ -0,0 +1,608 @@ 
    64+/* 
     
    612610+} 
    613611+module_exit(gpiommc_modexit); 
    614 Index: linux-2.6.25.10/drivers/mmc/host/Kconfig 
    615 =================================================================== 
    616 --- linux-2.6.25.10.orig/drivers/mmc/host/Kconfig       2008-07-20 20:32:22.000000000 +0200 
    617 +++ linux-2.6.25.10/drivers/mmc/host/Kconfig    2008-07-20 20:33:20.000000000 +0200 
    618 @@ -130,3 +130,27 @@ config MMC_SPI 
     612--- a/drivers/mmc/host/Kconfig 
     613+++ b/drivers/mmc/host/Kconfig 
     614@@ -130,3 +130,27 @@ 
    619615  
    620616          If unsure, or if your system has no SPI master driver, say N. 
     
    644640+         This option automatically enables configfs support for gpiommc 
    645641+         if configfs is available. 
    646 Index: linux-2.6.25.10/drivers/mmc/host/Makefile 
    647 =================================================================== 
    648 --- linux-2.6.25.10.orig/drivers/mmc/host/Makefile      2008-07-20 20:32:22.000000000 +0200 
    649 +++ linux-2.6.25.10/drivers/mmc/host/Makefile   2008-07-20 20:33:20.000000000 +0200 
    650 @@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)                += omap.o 
     642--- a/drivers/mmc/host/Makefile 
     643+++ b/drivers/mmc/host/Makefile 
     644@@ -17,4 +17,4 @@ 
    651645 obj-$(CONFIG_MMC_AT91)         += at91_mci.o 
    652646 obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o 
     
    654648- 
    655649+obj-$(CONFIG_GPIOMMC)          += gpiommc.o 
    656 Index: linux-2.6.25.10/include/linux/mmc/gpiommc.h 
    657 =================================================================== 
    658 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    659 +++ linux-2.6.25.10/include/linux/mmc/gpiommc.h 2008-07-20 20:33:20.000000000 +0200 
     650--- /dev/null 
     651+++ b/include/linux/mmc/gpiommc.h 
    660652@@ -0,0 +1,71 @@ 
    661653+/* 
     
    730722+ 
    731723+#endif /* LINUX_GPIOMMC_H_ */ 
    732 Index: linux-2.6.25.10/Documentation/gpiommc.txt 
    733 =================================================================== 
    734 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    735 +++ linux-2.6.25.10/Documentation/gpiommc.txt   2008-07-20 20:33:20.000000000 +0200 
     724--- /dev/null 
     725+++ b/Documentation/gpiommc.txt 
    736726@@ -0,0 +1,97 @@ 
    737727+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus 
     
    832822+There's no need to first unregister the device before removing it. That will 
    833823+be done automatically. 
    834 Index: linux-2.6.25.10/MAINTAINERS 
    835 =================================================================== 
    836 --- linux-2.6.25.10.orig/MAINTAINERS    2008-07-20 20:33:20.000000000 +0200 
    837 +++ linux-2.6.25.10/MAINTAINERS 2008-07-20 20:33:20.000000000 +0200 
    838 @@ -1736,6 +1736,11 @@ L:       gigaset307x-common@lists.sourceforge. 
     824--- a/MAINTAINERS 
     825+++ b/MAINTAINERS 
     826@@ -1736,6 +1736,11 @@ 
    839827 W:     http://gigaset307x.sourceforge.net/ 
    840828 S:     Maintained 
  • trunk/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch

    r11892 r11933  
    22does not lock access between files. 
    33 
    4 Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c 
    5 =================================================================== 
    6 --- linux-2.6.25.10.orig/drivers/mmc/host/gpiommc.c     2008-07-21 11:57:01.000000000 +0200 
    7 +++ linux-2.6.25.10/drivers/mmc/host/gpiommc.c  2008-07-21 12:01:33.000000000 +0200 
    8 @@ -143,6 +143,8 @@ struct gpiommc_configfs_device { 
     4--- a/drivers/mmc/host/gpiommc.c 
     5+++ b/drivers/mmc/host/gpiommc.c 
     6@@ -143,6 +143,8 @@ 
    97        struct platform_device *pdev; 
    108        /* The configuration */ 
     
    1513  
    1614 #define GPIO_INVALID   -1 
    17 @@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show( 
     15@@ -233,6 +235,8 @@ 
    1816        unsigned int gpio; 
    1917        int err = 0; 
     
    2422                gpio = dev->pdata.pins.gpio_di; 
    2523                if (gpio == GPIO_INVALID) 
    26 @@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show( 
     24@@ -293,6 +297,8 @@ 
    2725        WARN_ON(1); 
    2826        err = -ENOSYS; 
     
    3331 } 
    3432  
    35 @@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store 
     33@@ -352,6 +358,8 @@ 
    3634        int err = -EINVAL; 
    3735        unsigned long data; 
     
    4240                err = strict_strtoul(page, 10, &data); 
    4341                if (err) 
    44 @@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store 
     42@@ -477,6 +485,8 @@ 
    4543        WARN_ON(1); 
    4644        err = -ENOSYS; 
     
    5149 } 
    5250  
    53 @@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_ 
     51@@ -513,6 +523,7 @@ 
    5452        if (!dev) 
    5553                return NULL; 
  • trunk/target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch

    r11839 r11933  
    1 Index: linux-2.6.x/crypto/Kconfig 
    2 =================================================================== 
    3 RCS file: /cvs/sw/linux-2.6.x/crypto/Kconfig,v 
    4 retrieving revision 1.1.1.29 
    5 diff -u -r1.1.1.29 Kconfig 
    6 --- linux-2.6.x/crypto/Kconfig  10 Oct 2007 00:54:29 -0000      1.1.1.29 
    7 +++ linux-2.6.x/crypto/Kconfig  15 Dec 2007 11:08:08 -0000 
    8 @@ -471,3 +471,6 @@ 
     1--- a/crypto/Kconfig 
     2+++ b/crypto/Kconfig 
     3@@ -593,3 +593,6 @@ 
    94 source "drivers/crypto/Kconfig" 
    105  
     
    138+source "crypto/ocf/Kconfig" 
    149+ 
    15 Index: linux-2.6.x/crypto/Makefile 
    16 =================================================================== 
    17 RCS file: /cvs/sw/linux-2.6.x/crypto/Makefile,v 
    18 retrieving revision 1.1.1.23 
    19 diff -u -r1.1.1.23 Makefile 
    20 --- linux-2.6.x/crypto/Makefile 10 Oct 2007 00:54:29 -0000      1.1.1.23 
    21 +++ linux-2.6.x/crypto/Makefile 15 Dec 2007 11:08:08 -0000 
    22 @@ -51,6 +51,8 @@ 
     10--- a/crypto/Makefile 
     11+++ b/crypto/Makefile 
     12@@ -65,6 +65,8 @@ 
    2313  
    2414 obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o 
     
    2919 # generic algorithms and the async_tx api 
    3020 # 
    31 Index: linux-2.6.x/drivers/char/random.c 
    32 =================================================================== 
    33 RCS file: /cvs/sw/linux-2.6.x/drivers/char/random.c,v 
    34 retrieving revision 1.1.1.41 
    35 retrieving revision 1.6 
    36 diff -u -r1.1.1.41 -r1.6 
    37 --- linux-2.6.x/drivers/char/random.c   22 Apr 2008 01:36:57 -0000      1.1.1.41 
    38 +++ linux-2.6.x/drivers/char/random.c   22 Apr 2008 04:48:56 -0000      1.6 
     21--- a/drivers/char/random.c 
     22+++ b/drivers/char/random.c 
    3923@@ -129,6 +129,9 @@ 
    4024  *                                unsigned int value); 
     
    123107  
    124108 /********************************************************************* 
    125 Index: linux-2.6.x/fs/fcntl.c 
    126 =================================================================== 
    127 RCS file: /cvs/sw/linux-2.6.x/fs/fcntl.c,v 
    128 retrieving revision 1.1.1.39 
    129 retrieving revision 1.5 
    130 diff -u -r1.1.1.39 -r1.5 
    131 --- linux-2.6.x/fs/fcntl.c      22 Apr 2008 01:37:55 -0000      1.1.1.39 
    132 +++ linux-2.6.x/fs/fcntl.c      22 Apr 2008 04:49:02 -0000      1.5 
     109--- a/fs/fcntl.c 
     110+++ b/fs/fcntl.c 
    133111@@ -202,6 +202,7 @@ 
    134112                ret = dupfd(file, 0, 0); 
     
    139117 #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT | O_NOATIME) 
    140118  
    141 Index: linux-2.6.x/include/linux/miscdevice.h 
    142 =================================================================== 
    143 RCS file: /cvs/sw/linux-2.6.x/include/linux/miscdevice.h,v 
    144 retrieving revision 1.1.1.16 
    145 retrieving revision 1.8 
    146 diff -u -r1.1.1.16 -r1.8 
    147 --- linux-2.6.x/include/linux/miscdevice.h      22 Apr 2008 01:36:52 -0000      1.1.1.16 
    148 +++ linux-2.6.x/include/linux/miscdevice.h      22 Apr 2008 04:49:10 -0000      1.8 
     119--- a/include/linux/miscdevice.h 
     120+++ b/include/linux/miscdevice.h 
    149121@@ -12,6 +12,7 @@ 
    150122 #define APOLLO_MOUSE_MINOR 7 
     
    155127 #define TEMP_MINOR             131     /* Temperature Sensor */ 
    156128 #define RTC_MINOR 135 
    157 Index: linux-2.6.x/include/linux/random.h 
    158 =================================================================== 
    159 RCS file: /cvs/sw/linux-2.6.x/include/linux/random.h,v 
    160 retrieving revision 1.1.1.12 
    161 retrieving revision 1.5 
    162 diff -u -r1.1.1.12 -r1.5 
    163 --- linux-2.6.x/include/linux/random.h  26 Apr 2007 11:16:52 -0000      1.1.1.12 
    164 +++ linux-2.6.x/include/linux/random.h  22 May 2008 03:31:38 -0000      1.5 
     129--- a/include/linux/random.h 
     130+++ b/include/linux/random.h 
    165131@@ -8,6 +8,7 @@ 
    166132 #define _LINUX_RANDOM_H 
     
    213179 void generate_random_uuid(unsigned char uuid_out[16]); 
    214180  
    215 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    216 +++ linux/crypto/ocf/hifn/Makefile      2007-07-25 11:02:33.000000000 +1000 
     181--- /dev/null 
     182+++ b/crypto/ocf/hifn/Makefile 
    217183@@ -0,0 +1,13 @@ 
    218184+# for SGlinux builds 
     
    229195+endif 
    230196+ 
    231 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    232 +++ linux/crypto/ocf/safe/Makefile      2007-07-25 11:02:33.000000000 +1000 
     197--- /dev/null 
     198+++ b/crypto/ocf/safe/Makefile 
    233199@@ -0,0 +1,12 @@ 
    234200+# for SGlinux builds 
     
    244210+endif 
    245211+ 
    246 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    247 +++ linux/crypto/ocf/Makefile   2008-07-04 14:48:17.000000000 +1000 
     212--- /dev/null 
     213+++ b/crypto/ocf/Makefile 
    248214@@ -0,0 +1,120 @@ 
    249215+# for SGlinux builds 
     
    367333+               gzip -9 /tmp/crypto-tools-$$REL.tar 
    368334+ 
    369 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    370 +++ linux/crypto/ocf/talitos/Makefile   2007-07-25 11:02:33.000000000 +1000 
     335--- /dev/null 
     336+++ b/crypto/ocf/talitos/Makefile 
    371337@@ -0,0 +1,12 @@ 
    372338+# for SGlinux builds 
     
    382348+endif 
    383349+ 
    384 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    385 +++ linux/crypto/ocf/ixp4xx/Makefile    2007-10-19 11:24:59.000000000 +1000 
     350--- /dev/null 
     351+++ b/crypto/ocf/ixp4xx/Makefile 
    386352@@ -0,0 +1,104 @@ 
    387353+# for SGlinux builds 
     
    489455+endif 
    490456+ 
    491 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    492 +++ linux/crypto/ocf/ocfnull/Makefile   2007-07-25 11:02:33.000000000 +1000 
     457--- /dev/null 
     458+++ b/crypto/ocf/ocfnull/Makefile 
    493459@@ -0,0 +1,12 @@ 
    494460+# for SGlinux builds 
     
    504470+endif 
    505471+ 
    506 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    507 +++ linux/crypto/ocf/pasemi/Makefile    2007-12-12 11:36:18.000000000 +1000 
     472--- /dev/null 
     473+++ b/crypto/ocf/pasemi/Makefile 
    508474@@ -0,0 +1,12 @@ 
    509475+# for SGlinux builds 
     
    519485+endif 
    520486+ 
    521 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    522 +++ linux/crypto/ocf/Config.in  2008-06-23 10:09:55.000000000 +1000 
     487--- /dev/null 
     488+++ b/crypto/ocf/Config.in 
    523489@@ -0,0 +1,32 @@ 
    524490+############################################################################# 
     
    554520+ 
    555521+############################################################################# 
    556 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    557 +++ linux/crypto/ocf/Kconfig    2008-06-23 10:10:33.000000000 +1000 
     522--- /dev/null 
     523+++ b/crypto/ocf/Kconfig 
    558524@@ -0,0 +1,95 @@ 
    559525+menu "OCF Configuration" 
     
    652618+ 
    653619+endmenu 
    654 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    655 +++ linux/crypto/ocf/README     2007-12-15 21:31:03.000000000 +1000 
     620--- /dev/null 
     621+++ b/crypto/ocf/README 
    656622@@ -0,0 +1,166 @@ 
    657623+README - ocf-linux-20071215 
     
    821787+David McCullough 
    822788+david_mccullough@securecomputing.com 
    823 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    824 +++ linux/crypto/ocf/hifn/hifn7751reg.h 2007-06-20 09:15:58.000000000 +1000 
     789--- /dev/null 
     790+++ b/crypto/ocf/hifn/hifn7751reg.h 
    825791@@ -0,0 +1,540 @@ 
    826792+/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.7 2007/03/21 03:42:49 sam Exp $ */ 
     
    13641330+#define        HIFN_MAX_DMALEN         0x3ffff         /* maximum dma length */ 
    13651331+#endif /* __HIFN_H__ */ 
    1366 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    1367 +++ linux/crypto/ocf/hifn/hifn7751var.h 2007-06-20 09:22:39.000000000 +1000 
     1332--- /dev/null 
     1333+++ b/crypto/ocf/hifn/hifn7751var.h 
    13681334@@ -0,0 +1,369 @@ 
    13691335+/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.9 2007/03/21 03:42:49 sam Exp $ */ 
     
    17361702+ 
    17371703+#endif /* __HIFN7751VAR_H__ */ 
    1738 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    1739 +++ linux/crypto/ocf/hifn/hifn7751.c    2008-02-14 14:59:01.000000000 +1000 
     1704--- /dev/null 
     1705+++ b/crypto/ocf/hifn/hifn7751.c 
    17401706@@ -0,0 +1,2970 @@ 
    17411707+/*     $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $  */ 
     
    47094675+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    47104676+MODULE_DESCRIPTION("OCF driver for hifn PCI crypto devices"); 
    4711 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    4712 +++ linux/crypto/ocf/hifn/hifnHIPP.c    2007-07-25 14:36:45.000000000 +1000 
     4677--- /dev/null 
     4678+++ b/crypto/ocf/hifn/hifnHIPP.c 
    47134679@@ -0,0 +1,420 @@ 
    47144680+/*- 
     
    51325098+MODULE_AUTHOR("Michael Richardson <mcr@xelerance.com>"); 
    51335099+MODULE_DESCRIPTION("OCF driver for hifn HIPP-I/II PCI crypto devices"); 
    5134 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    5135 +++ linux/crypto/ocf/hifn/hifnHIPPreg.h 2007-07-25 10:11:22.000000000 +1000 
     5100--- /dev/null 
     5101+++ b/crypto/ocf/hifn/hifnHIPPreg.h 
    51365102@@ -0,0 +1,46 @@ 
    51375103+/*- 
     
    51815147+ 
    51825148+#endif /* __HIPP_H__ */ 
    5183 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    5184 +++ linux/crypto/ocf/hifn/hifnHIPPvar.h 2007-07-25 13:47:04.000000000 +1000 
     5149--- /dev/null 
     5150+++ b/crypto/ocf/hifn/hifnHIPPvar.h 
    51855151@@ -0,0 +1,93 @@ 
    51865152+/* 
     
    52775243+ 
    52785244+#endif /* __HIFNHIPPVAR_H__ */ 
    5279 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    5280 +++ linux/crypto/ocf/safe/md5.c 2005-05-20 10:30:52.000000000 +1000 
     5245--- /dev/null 
     5246+++ b/crypto/ocf/safe/md5.c 
    52815247@@ -0,0 +1,308 @@ 
    52825248+/*     $KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $     */ 
     
    55885554+       ctxt->md5_std += D; 
    55895555+} 
    5590 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    5591 +++ linux/crypto/ocf/safe/md5.h 2005-05-20 10:30:52.000000000 +1000 
     5556--- /dev/null 
     5557+++ b/crypto/ocf/safe/md5.h 
    55925558@@ -0,0 +1,76 @@ 
    55935559+/*     $FreeBSD: src/sys/crypto/md5.h,v 1.4 2002/03/20 05:13:50 alfred Exp $   */ 
     
    56675633+ 
    56685634+#endif /* ! _NETINET6_MD5_H_*/ 
    5669 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    5670 +++ linux/crypto/ocf/safe/safe.c        2007-07-27 11:34:59.000000000 +1000 
     5635--- /dev/null 
     5636+++ b/crypto/ocf/safe/safe.c 
    56715637@@ -0,0 +1,2288 @@ 
    56725638+/*- 
     
    79587924+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    79597925+MODULE_DESCRIPTION("OCF driver for safenet PCI crypto devices"); 
    7960 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    7961 +++ linux/crypto/ocf/safe/sha1.c        2005-05-20 10:30:53.000000000 +1000 
     7926--- /dev/null 
     7927+++ b/crypto/ocf/safe/sha1.c 
    79627928@@ -0,0 +1,279 @@ 
    79637929+/*     $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $    */ 
     
    82408206+ 
    82418207+#endif /*unsupported*/ 
    8242 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    8243 +++ linux/crypto/ocf/safe/sha1.h        2005-05-20 10:30:53.000000000 +1000 
     8208--- /dev/null 
     8209+++ b/crypto/ocf/safe/sha1.h 
    82448210@@ -0,0 +1,72 @@ 
    82458211+/*     $FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $  */ 
     
    83158281+ 
    83168282+#endif /*_NETINET6_SHA1_H_*/ 
    8317 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    8318 +++ linux/crypto/ocf/safe/safereg.h     2005-03-16 15:19:57.000000000 +1000 
     8283--- /dev/null 
     8284+++ b/crypto/ocf/safe/safereg.h 
    83198285@@ -0,0 +1,421 @@ 
    83208286+/*- 
     
    87398705+}; 
    87408706+#endif /* _SAFE_SAFEREG_H_ */ 
    8741 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    8742 +++ linux/crypto/ocf/safe/safevar.h     2007-07-03 09:46:58.000000000 +1000 
     8707--- /dev/null 
     8708+++ b/crypto/ocf/safe/safevar.h 
    87438709@@ -0,0 +1,230 @@ 
    87448710+/*- 
     
    89728938+}; 
    89738939+#endif /* _SAFE_SAFEVAR_H_ */ 
    8974 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    8975 +++ linux/crypto/ocf/crypto.c   2008-07-03 10:58:33.000000000 +1000 
     8940--- /dev/null 
     8941+++ b/crypto/ocf/crypto.c 
    89768942@@ -0,0 +1,1741 @@ 
    89778943+/*- 
     
    1071610682+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    1071710683+MODULE_DESCRIPTION("OCF (OpenBSD Cryptographic Framework)"); 
    10718 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    10719 +++ linux/crypto/ocf/criov.c    2007-07-18 13:01:47.000000000 +1000 
     10684--- /dev/null 
     10685+++ b/crypto/ocf/criov.c 
    1072010686@@ -0,0 +1,215 @@ 
    1072110687+/*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $        */ 
     
    1093410900+EXPORT_SYMBOL(crypto_apply); 
    1093510901+ 
    10936 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    10937 +++ linux/crypto/ocf/uio.h      2007-07-03 09:52:33.000000000 +1000 
     10902--- /dev/null 
     10903+++ b/crypto/ocf/uio.h 
    1093810904@@ -0,0 +1,54 @@ 
    1093910905+#ifndef _OCF_UIO_H_ 
     
    1099110957+ 
    1099210958+#endif 
    10993 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    10994 +++ linux/crypto/ocf/talitos/talitos.c  2008-04-01 15:48:31.000000000 +1000 
     10959--- /dev/null 
     10960+++ b/crypto/ocf/talitos/talitos.c 
    1099510961@@ -0,0 +1,1359 @@ 
    1099610962+/* 
     
    1235312319+MODULE_AUTHOR("kim.phillips@freescale.com"); 
    1235412320+MODULE_DESCRIPTION("OCF driver for Freescale SEC (talitos)"); 
    12355 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    12356 +++ linux/crypto/ocf/talitos/talitos_soft.h     2007-07-20 11:47:16.000000000 +1000 
     12321--- /dev/null 
     12322+++ b/crypto/ocf/talitos/talitos_soft.h 
    1235712323@@ -0,0 +1,77 @@ 
    1235812324+/* 
     
    1243312399+#define        TALITOS_SESSION(sid)    ((sid) & 0x0fffffff) 
    1243412400+#define        TALITOS_SID(crd, sesn)  (((crd) << 28) | ((sesn) & 0x0fffffff)) 
    12435 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    12436 +++ linux/crypto/ocf/talitos/talitos_dev.h      2007-11-23 07:31:44.000000000 +1000 
     12401--- /dev/null 
     12402+++ b/crypto/ocf/talitos/talitos_dev.h 
    1243712403@@ -0,0 +1,277 @@ 
    1243812404+/* 
     
    1271312679+                                               } \ 
    1271412680+                                       } while (0) 
    12715 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    12716 +++ linux/crypto/ocf/random.c   2007-12-04 13:56:03.000000000 +1000 
     12681--- /dev/null 
     12682+++ b/crypto/ocf/random.c 
    1271712683@@ -0,0 +1,317 @@ 
    1271812684+/* 
     
    1303312999+} 
    1303413000+ 
    13035 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    13036 +++ linux/crypto/ocf/ocf-bench.c        2007-07-23 22:26:12.000000000 +1000 
     13001--- /dev/null 
     13002+++ b/crypto/ocf/ocf-bench.c 
    1303713003@@ -0,0 +1,436 @@ 
    1303813004+/* 
     
    1347213438+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    1347313439+MODULE_DESCRIPTION("Benchmark various in-kernel crypto speeds"); 
    13474 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    13475 +++ linux/crypto/ocf/ixp4xx/ixp4xx.c    2008-07-03 10:28:05.000000000 +1000 
     13440--- /dev/null 
     13441+++ b/crypto/ocf/ixp4xx/ixp4xx.c 
    1347613442@@ -0,0 +1,1328 @@ 
    1347713443+/* 
     
    1480314769+MODULE_AUTHOR("David McCullough <dmccullough@cyberguard.com>"); 
    1480414770+MODULE_DESCRIPTION("ixp (OCF module for IXP4xx crypto)"); 
    14805 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    14806 +++ linux/crypto/ocf/cryptodev.c        2007-12-14 12:35:04.000000000 +1000 
     14771--- /dev/null 
     14772+++ b/crypto/ocf/cryptodev.c 
    1480714773@@ -0,0 +1,1048 @@ 
    1480814774+/*     $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $  */ 
     
    1585415820+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    1585515821+MODULE_DESCRIPTION("Cryptodev (user interface to OCF)"); 
    15856 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    15857 +++ linux/crypto/ocf/cryptodev.h        2007-09-26 22:15:05.000000000 +1000 
     15822--- /dev/null 
     15823+++ b/crypto/ocf/cryptodev.h 
    1585815824@@ -0,0 +1,478 @@ 
    1585915825+/*     $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $   */ 
     
    1633516301+#endif /* __KERNEL__ */ 
    1633616302+#endif /* _CRYPTO_CRYPTO_H_ */ 
    16337 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    16338 +++ linux/crypto/ocf/ocfnull/ocfnull.c  2007-07-13 16:02:05.000000000 +1000 
     16303--- /dev/null 
     16304+++ b/crypto/ocf/ocfnull/ocfnull.c 
    1633916305@@ -0,0 +1,203 @@ 
    1634016306+/* 
     
    1654116507+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    1654216508+MODULE_DESCRIPTION("ocfnull - claims a lot but does nothing"); 
    16543 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    16544 +++ linux/crypto/ocf/cryptosoft.c       2008-02-14 14:59:01.000000000 +1000 
     16509--- /dev/null 
     16510+++ b/crypto/ocf/cryptosoft.c 
    1654516511@@ -0,0 +1,898 @@ 
    1654616512+/* 
     
    1744217408+MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>"); 
    1744317409+MODULE_DESCRIPTION("Cryptosoft (OCF module for kernel crypto)"); 
    17444 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    17445 +++ linux/crypto/ocf/rndtest.c  2007-07-20 13:22:03.000000000 +1000 
     17410--- /dev/null 
     17411+++ b/crypto/ocf/rndtest.c 
    1744617412@@ -0,0 +1,300 @@ 
    1744717413+/*     $OpenBSD$       */ 
     
    1774517711+} 
    1774617712+ 
    17747 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    17748 +++ linux/crypto/ocf/rndtest.h  2005-05-20 10:28:26.000000000 +1000 
     17713--- /dev/null 
     17714+++ b/crypto/ocf/rndtest.h 
    1774917715@@ -0,0 +1,54 @@ 
    1775017716+/*     $FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.1 2003/03/11 22:54:44 sam Exp $     */ 
     
    1780217768+ 
    1780317769+extern int rndtest_buf(unsigned char *buf); 
    17804 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    17805 +++ linux/crypto/ocf/ocf-compat.h       2008-04-27 09:30:47.000000000 +1000 
     17770--- /dev/null 
     17771+++ b/crypto/ocf/ocf-compat.h 
    1780617772@@ -0,0 +1,268 @@ 
    1780717773+#ifndef _BSD_COMPAT_H_ 
     
    1807318039+/****************************************************************************/ 
    1807418040+#endif /* _BSD_COMPAT_H_ */ 
    18075 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    18076 +++ linux/crypto/ocf/pasemi/pasemi.c    2007-12-12 11:36:18.000000000 +1000 
     18041--- /dev/null 
     18042+++ b/crypto/ocf/pasemi/pasemi.c 
    1807718043@@ -0,0 +1,1009 @@ 
    1807818044+/* 
     
    1908519051+MODULE_AUTHOR("Egor Martovetsky egor@pasemi.com"); 
    1908619052+MODULE_DESCRIPTION("OCF driver for PA Semi PWRficient DMA Crypto Engine"); 
    19087 --- /dev/null   2007-07-04 13:54:27.000000000 +1000 
    19088 +++ linux/crypto/ocf/pasemi/pasemi_fnu.h        2007-12-12 11:36:18.000000000 +1000 
     19053--- /dev/null 
     19054+++ b/crypto/ocf/pasemi/pasemi_fnu.h 
    1908919055@@ -0,0 +1,410 @@ 
    1909019056+/* 
  • trunk/target/linux/generic-2.6/patches-2.6.25/951-ocf-scatterlist-inc.patch

    r11839 r11933  
    1 diff -Nru linux-2.6.25.10-old/crypto/ocf/cryptosoft.c linux-2.6.25.10/crypto/ocf/cryptosoft.c 
    2 --- linux-2.6.25.10-old/crypto/ocf/cryptosoft.c 2008-07-08 23:38:58.114980680 +0200 
    3 +++ linux-2.6.25.10/crypto/ocf/cryptosoft.c     2008-07-08 23:31:15.866980267 +0200 
     1--- a/crypto/ocf/cryptosoft.c 
     2+++ b/crypto/ocf/cryptosoft.c 
    43@@ -48,6 +48,7 @@ 
    54 #include <linux/skbuff.h> 
  • trunk/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch

    r11894 r11933  
    2323--- 
    2424 
    25 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c 
    26 index d8db2f8..eb75d12 100644 
    2725--- a/drivers/gpio/gpiolib.c 
    2826+++ b/drivers/gpio/gpiolib.c 
    29 @@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct gpio_desc *desc) 
     27@@ -68,6 +68,9 @@ 
    3028        if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) { 
    3129                pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc)); 
     
    3735 } 
    3836  
    39 @@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const char *label) 
     37@@ -177,6 +180,9 @@ 
    4038        if (desc->chip == NULL) 
    4139                goto done; 
     
    4745         * before IRQs are enabled. 
    4846         */ 
    49 @@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const char *label) 
     47@@ -184,8 +190,10 @@ 
    5048        if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) { 
    5149                desc_set_label(desc, label ? : "?"); 
     
    5957 done: 
    6058        if (status) 
    61 @@ -209,9 +217,10 @@ void gpio_free(unsigned gpio) 
     59@@ -209,9 +217,10 @@ 
    6260        spin_lock_irqsave(&gpio_lock, flags); 
    6361  
     
    7270  
    7371        spin_unlock_irqrestore(&gpio_lock, flags); 
    74 diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h 
    75 index f29a502..7e77b6f 100644 
    7672--- a/include/asm-generic/gpio.h 
    7773+++ b/include/asm-generic/gpio.h 
     
    8480 /** 
    8581  * struct gpio_chip - abstract a GPIO controller 
    86 @@ -48,6 +49,7 @@ struct seq_file; 
     82@@ -48,6 +49,7 @@ 
    8783  */ 
    8884 struct gpio_chip { 
  • trunk/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch

    r11907 r11933  
    1717--- 
    1818 
    19 diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt 
    20 index 5463009..c35ca9e 100644 
    2119--- a/Documentation/gpio.txt 
    2220+++ b/Documentation/gpio.txt 
    23 @@ -107,6 +107,16 @@ type of GPIO controller, and on one particular board 80-95 with an FPGA. 
     21@@ -107,6 +107,16 @@ 
    2422 The numbers need not be contiguous; either of those platforms could also 
    2523 use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders. 
     
    3836 platform-specific implementation issue. 
    3937  
    40 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c 
    41 index eb75d12..623fcd9 100644 
    4238--- a/drivers/gpio/gpiolib.c 
    4339+++ b/drivers/gpio/gpiolib.c 
    44 @@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip) 
     40@@ -99,7 +99,7 @@ 
    4541         * dynamic allocation.  We don't currently support that. 
    4642         */ 
     
    5147                goto fail; 
    5248        } 
    53 @@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const char *label) 
     49@@ -174,7 +174,7 @@ 
    5450  
    5551        spin_lock_irqsave(&gpio_lock, flags); 
     
    6056        desc = &gpio_desc[gpio]; 
    6157        if (desc->chip == NULL) 
    62 @@ -209,7 +209,7 @@ void gpio_free(unsigned gpio) 
     58@@ -209,7 +209,7 @@ 
    6359        unsigned long           flags; 
    6460        struct gpio_desc        *desc; 
     
    6965                return; 
    7066        } 
    71 @@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset) 
     67@@ -245,7 +245,7 @@ 
    7268 { 
    7369        unsigned gpio = chip->base + offset; 
     
    7874        if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) 
    7975                return NULL; 
    80 @@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio) 
     76@@ -276,7 +276,7 @@ 
    8177  
    8278        spin_lock_irqsave(&gpio_lock, flags); 
     
    8783        chip = desc->chip; 
    8884        if (!chip || !chip->get || !chip->direction_input) 
    89 @@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio, int value) 
     85@@ -314,7 +314,7 @@ 
    9086  
    9187        spin_lock_irqsave(&gpio_lock, flags); 
     
    9692        chip = desc->chip; 
    9793        if (!chip || !chip->set || !chip->direction_output) 
    98 @@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file *s, void *unused) 
     94@@ -531,7 +531,7 @@ 
    9995  
    10096        /* REVISIT this isn't locked against gpio_chip removal ... */ 
     
    105101                        continue; 
    106102                chip = gpio_desc[gpio].chip; 
    107 diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h 
    108 index 7e77b6f..464c5b3 100644 
    109103--- a/include/asm-generic/gpio.h 
    110104+++ b/include/asm-generic/gpio.h 
     
    122116 struct module; 
    123117  
    124 @@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio); 
     118@@ -99,6 +105,16 @@ 
    125119  
    126120 #else 
  • trunk/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch

    r11894 r11933  
    2222--- 
    2323 
    24 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c 
    25 index 623fcd9..2ba6127 100644 
    2624--- a/drivers/gpio/gpiolib.c 
    2725+++ b/drivers/gpio/gpiolib.c 
    28 @@ -80,6 +80,33 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio) 
     26@@ -80,6 +80,33 @@ 
    2927        return gpio_desc[gpio].chip; 
    3028 } 
     
    6058  * gpiochip_add() - register a gpio_chip 
    6159  * @chip: the chip to register, with chip->base initialized 
    62 @@ -88,38 +115,49 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio) 
     60@@ -88,38 +115,49 @@ 
    6361  * Returns a negative errno if the chip can't be registered, such as 
    6462  * because the chip->base is invalid or already associated with a 
  • trunk/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch

    r11894 r11933  
    2020--- 
    2121 
    22 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c 
    23 index 2ba6127..24c62b8 100644 
    2422--- a/drivers/gpio/gpiolib.c 
    2523+++ b/drivers/gpio/gpiolib.c 
    26 @@ -43,6 +43,7 @@ struct gpio_desc { 
     24@@ -43,6 +43,7 @@ 
    2725 /* flag symbols are bit numbers */ 
    2826 #define FLAG_REQUESTED 0 
     
    3230 #ifdef CONFIG_DEBUG_FS 
    3331        const char              *label; 
    34 @@ -88,9 +89,10 @@ static int gpiochip_find_base(int ngpio) 
     32@@ -88,9 +89,10 @@ 
    3533        int base = -ENOSPC; 
    3634  
     
    4543                        if (spare == ngpio) { 
    4644                                base = i; 
    47 @@ -98,7 +100,8 @@ static int gpiochip_find_base(int ngpio) 
     45@@ -98,7 +100,8 @@ 
    4846                        } 
    4947                } else { 
     
    5553        } 
    5654  
    57 @@ -108,6 +111,47 @@ static int gpiochip_find_base(int ngpio) 
     55@@ -108,6 +111,47 @@ 
    5856 } 
    5957  
     
    103101  * @chip: the chip to register, with chip->base initialized 
    104102  * Context: potentially before irqs or kmalloc will work 
    105 diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h 
    106 index 464c5b3..ecf675a 100644 
    107103--- a/include/asm-generic/gpio.h 
    108104+++ b/include/asm-generic/gpio.h 
    109 @@ -74,6 +74,7 @@ struct gpio_chip { 
     105@@ -74,6 +74,7 @@ 
    110106  
    111107 extern const char *gpiochip_is_requested(struct gpio_chip *chip, 
  • trunk/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch

    r11894 r11933  
    1616--- 
    1717 
    18 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c 
    19 index 7f138c6..beaf6b3 100644 
    2018--- a/drivers/gpio/gpiolib.c 
    2119+++ b/drivers/gpio/gpiolib.c 
    22 @@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, int ngpio) 
     20@@ -127,7 +127,7 @@ 
    2321        unsigned long flags; 
    2422        int i; 
     
    2927  
    3028        spin_lock_irqsave(&gpio_lock, flags); 
    31 @@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip) 
     29@@ -170,7 +170,7 @@ 
    3230        unsigned        id; 
    3331        int             base = chip->base; 
     
    3836                status = -EINVAL; 
    3937                goto fail; 
    40 @@ -207,7 +207,7 @@ fail: 
     38@@ -207,7 +207,7 @@ 
    4139        /* failures here can mean systems won't boot... */ 
    4240        if (status) 
  • trunk/target/linux/ifxmips/Makefile

    r11667 r11933  
    1111BOARDNAME:=Infineon Mips 
    1212FEATURES:=squashfs jffs2 
    13 LINUX_VERSION:=2.6.25.10 
     13LINUX_VERSION:=2.6.25.12 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ifxmips/patches/100-board.patch

    r11596 r11933  
    1 Index: linux-2.6.25.7/arch/mips/Kconfig 
    2 =================================================================== 
    3 --- linux-2.6.25.7.orig/arch/mips/Kconfig       2008-06-26 10:42:44.000000000 +0200 
    4 +++ linux-2.6.25.7/arch/mips/Kconfig    2008-06-26 22:05:19.000000000 +0200 
     1--- a/arch/mips/Kconfig 
     2+++ b/arch/mips/Kconfig 
    53@@ -78,6 +78,21 @@ 
    64        select SYS_SUPPORTS_LITTLE_ENDIAN 
     
    3331 endmenu 
    3432  
    35 Index: linux-2.6.25.7/arch/mips/Makefile 
    36 =================================================================== 
    37 --- linux-2.6.25.7.orig/arch/mips/Makefile      2008-06-26 10:42:55.000000000 +0200 
    38 +++ linux-2.6.25.7/arch/mips/Makefile   2008-06-26 10:42:56.000000000 +0200 
     33--- a/arch/mips/Makefile 
     34+++ b/arch/mips/Makefile 
    3935@@ -283,6 +283,13 @@ 
    4036 load-$(CONFIG_MIPS_COBALT)     += 0xffffffff80080000 
     
    5147 # 
    5248 core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/ 
    53 Index: linux-2.6.25.7/include/asm-mips/bootinfo.h 
    54 =================================================================== 
    55 --- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h     2008-06-26 10:42:44.000000000 +0200 
    56 +++ linux-2.6.25.7/include/asm-mips/bootinfo.h  2008-06-26 10:42:56.000000000 +0200 
     49--- a/include/asm-mips/bootinfo.h 
     50+++ b/include/asm-mips/bootinfo.h 
    5751@@ -94,6 +94,12 @@ 
    5852 #define MACH_MSP7120_FPGA       5      /* PMC-Sierra MSP7120 Emulation */ 
     
    6862  
    6963 extern char *system_type; 
    70 Index: linux-2.6.25.7/arch/mips/kernel/traps.c 
    71 =================================================================== 
    72 --- linux-2.6.25.7.orig/arch/mips/kernel/traps.c        2008-06-26 10:42:44.000000000 +0200 
    73 +++ linux-2.6.25.7/arch/mips/kernel/traps.c     2008-06-26 10:42:56.000000000 +0200 
     64--- a/arch/mips/kernel/traps.c 
     65+++ b/arch/mips/kernel/traps.c 
    7466@@ -1379,6 +1379,7 @@ 
    7567         */ 
     
    8072                if (cp0_perfcount_irq == cp0_compare_irq) 
    8173                        cp0_perfcount_irq = -1; 
    82 Index: linux-2.6.25.7/arch/mips/pci/Makefile 
    83 =================================================================== 
    84 --- linux-2.6.25.7.orig/arch/mips/pci/Makefile  2008-06-26 10:42:44.000000000 +0200 
    85 +++ linux-2.6.25.7/arch/mips/pci/Makefile       2008-06-26 10:42:56.000000000 +0200 
     74--- a/arch/mips/pci/Makefile 
     75+++ b/arch/mips/pci/Makefile 
    8676@@ -48,3 +48,4 @@ 
    8777 obj-$(CONFIG_VICTOR_MPC30X)    += fixup-mpc30x.o 
  • trunk/target/linux/ifxmips/patches/110-drivers.patch

    r11596 r11933  
    1 Index: linux-2.6.25.7/drivers/char/Makefile 
    2 =================================================================== 
    3 --- linux-2.6.25.7.orig/drivers/char/Makefile   2008-06-26 09:53:43.000000000 +0200 
    4 +++ linux-2.6.25.7/drivers/char/Makefile        2008-06-26 09:53:53.000000000 +0200 
     1--- a/drivers/char/Makefile 
     2+++ b/drivers/char/Makefile 
    53@@ -113,6 +113,10 @@ 
    64 obj-$(CONFIG_JS_RTC)           += js-rtc.o 
     
    1412 clean-files := consolemap_deftbl.c defkeymap.c 
    1513  
    16 Index: linux-2.6.25.7/drivers/mtd/maps/Makefile 
    17 =================================================================== 
    18 --- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile       2008-06-26 09:53:43.000000000 +0200 
    19 +++ linux-2.6.25.7/drivers/mtd/maps/Makefile    2008-06-26 09:53:53.000000000 +0200 
     14--- a/drivers/mtd/maps/Makefile 
     15+++ b/drivers/mtd/maps/Makefile 
    2016@@ -68,3 +68,4 @@ 
    2117 obj-$(CONFIG_MTD_OMAP_NOR)     += omap_nor.o 
     
    2319 obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o 
    2420+obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o 
    25 Index: linux-2.6.25.7/drivers/net/Kconfig 
    26 =================================================================== 
    27 --- linux-2.6.25.7.orig/drivers/net/Kconfig     2008-06-26 09:53:43.000000000 +0200 
    28 +++ linux-2.6.25.7/drivers/net/Kconfig  2008-06-26 09:53:53.000000000 +0200 
     21--- a/drivers/net/Kconfig 
     22+++ b/drivers/net/Kconfig 
    2923@@ -351,6 +351,12 @@ 
    3024  
     
    4034        tristate "ASIX AX88796 NE2000 clone support" 
    4135        depends on ARM || MIPS || SUPERH 
    42 Index: linux-2.6.25.7/drivers/serial/Kconfig 
    43 =================================================================== 
    44 --- linux-2.6.25.7.orig/drivers/serial/Kconfig  2008-06-26 09:53:43.000000000 +0200 
    45 +++ linux-2.6.25.7/drivers/serial/Kconfig       2008-06-26 09:53:53.000000000 +0200 
     36--- a/drivers/serial/Kconfig 
     37+++ b/drivers/serial/Kconfig 
    4638@@ -1327,6 +1327,14 @@ 
    4739          Currently, only 8250 compatible ports are supported, but 
     
    5951        tristate "Freescale QUICC Engine serial port support" 
    6052        depends on QUICC_ENGINE 
    61 Index: linux-2.6.25.7/drivers/serial/Makefile 
    62 =================================================================== 
    63 --- linux-2.6.25.7.orig/drivers/serial/Makefile 2008-06-26 09:53:43.000000000 +0200 
    64 +++ linux-2.6.25.7/drivers/serial/Makefile      2008-06-26 09:53:53.000000000 +0200 
     53--- a/drivers/serial/Makefile 
     54+++ b/drivers/serial/Makefile 
    6555@@ -66,4 +66,5 @@ 
    6656 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o 
     
    6959+obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o 
    7060 obj-$(CONFIG_SERIAL_QE) += ucc_uart.o 
    71 Index: linux-2.6.25.7/drivers/watchdog/Makefile 
    72 =================================================================== 
    73 --- linux-2.6.25.7.orig/drivers/watchdog/Makefile       2008-06-26 09:53:43.000000000 +0200 
    74 +++ linux-2.6.25.7/drivers/watchdog/Makefile    2008-06-26 09:53:53.000000000 +0200 
     61--- a/drivers/watchdog/Makefile 
     62+++ b/drivers/watchdog/Makefile 
    7563@@ -96,6 +96,7 @@ 
    7664 obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 
     
    8169 # PARISC Architecture 
    8270  
    83 Index: linux-2.6.25.7/drivers/net/Makefile 
    84 =================================================================== 
    85 --- linux-2.6.25.7.orig/drivers/net/Makefile    2008-06-26 09:53:43.000000000 +0200 
    86 +++ linux-2.6.25.7/drivers/net/Makefile 2008-06-26 09:53:53.000000000 +0200 
     71--- a/drivers/net/Makefile 
     72+++ b/drivers/net/Makefile 
    8773@@ -254,3 +254,4 @@ 
    8874 obj-$(CONFIG_NETXEN_NIC) += netxen/ 
     
    9076 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o 
    9177+obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o 
    92 Index: linux-2.6.25.7/drivers/crypto/Kconfig 
    93 =================================================================== 
    94 --- linux-2.6.25.7.orig/drivers/crypto/Kconfig  2008-06-26 09:53:43.000000000 +0200 
    95 +++ linux-2.6.25.7/drivers/crypto/Kconfig       2008-06-26 09:53:53.000000000 +0200 
     78--- a/drivers/crypto/Kconfig 
     79+++ b/drivers/crypto/Kconfig 
    9680@@ -9,6 +9,9 @@ 
    9781          If you say N, all options in this submenu will be skipped and disabled. 
     
    10488 config CRYPTO_DEV_PADLOCK 
    10589        tristate "Support for VIA PadLock ACE" 
    106 Index: linux-2.6.25.7/drivers/crypto/Makefile 
    107 =================================================================== 
    108 --- linux-2.6.25.7.orig/drivers/crypto/Makefile 2008-06-26 09:53:43.000000000 +0200 
    109 +++ linux-2.6.25.7/drivers/crypto/Makefile      2008-06-26 09:53:53.000000000 +0200 
     90--- a/drivers/crypto/Makefile 
     91+++ b/drivers/crypto/Makefile 
    11092@@ -2,3 +2,4 @@ 
    11193 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o 
     
    11395 obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o 
    11496+obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o 
    115 Index: linux-2.6.25.7/drivers/usb/host/Kconfig 
    116 =================================================================== 
    117 --- linux-2.6.25.7.orig/drivers/usb/host/Kconfig        2008-06-26 09:53:43.000000000 +0200 
    118 +++ linux-2.6.25.7/drivers/usb/host/Kconfig     2008-06-26 09:53:53.000000000 +0200 
     97--- a/drivers/usb/host/Kconfig 
     98+++ b/drivers/usb/host/Kconfig 
    11999@@ -260,3 +260,9 @@ 
    120100          To compile this driver as a module, choose M here: the 
     
    127107+       help 
    128108+               Danube USB Host Controller 
    129 Index: linux-2.6.25.7/drivers/usb/host/Makefile 
    130 =================================================================== 
    131 --- linux-2.6.25.7.orig/drivers/usb/host/Makefile       2008-06-26 09:53:43.000000000 +0200 
    132 +++ linux-2.6.25.7/drivers/usb/host/Makefile    2008-06-26 09:53:53.000000000 +0200 
     109--- a/drivers/usb/host/Makefile 
     110+++ b/drivers/usb/host/Makefile 
    133111@@ -16,4 +16,6 @@ 
    134112 obj-$(CONFIG_USB_SL811_CS)     += sl811_cs.o 
     
    139117+                       dwc_otg_attr.o dwc_otg_driver.o dwc_otg_cil.o \ 
    140118+                       dwc_otg_cil_intr.o dwc_otg_proc.o dwc_otg_ifx.o 
    141 Index: linux-2.6.25.7/drivers/leds/Kconfig 
    142 =================================================================== 
    143 --- linux-2.6.25.7.orig/drivers/leds/Kconfig    2008-06-26 09:53:43.000000000 +0200 
    144 +++ linux-2.6.25.7/drivers/leds/Kconfig 2008-06-26 09:53:53.000000000 +0200 
     119--- a/drivers/leds/Kconfig 
     120+++ b/drivers/leds/Kconfig 
    145121@@ -151,6 +151,12 @@ 
    146122          To compile this driver as a module, choose M here: the 
     
    156132  
    157133 config LEDS_TRIGGERS 
    158 Index: linux-2.6.25.7/drivers/leds/Makefile 
    159 =================================================================== 
    160 --- linux-2.6.25.7.orig/drivers/leds/Makefile   2008-06-26 09:53:43.000000000 +0200 
    161 +++ linux-2.6.25.7/drivers/leds/Makefile        2008-06-26 09:53:53.000000000 +0200 
     134--- a/drivers/leds/Makefile 
     135+++ b/drivers/leds/Makefile 
    162136@@ -22,6 +22,7 @@ 
    163137 obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o 
     
    168142 # LED Triggers 
    169143 obj-$(CONFIG_LEDS_TRIGGER_TIMER)       += ledtrig-timer.o 
    170 Index: linux-2.6.25.7/drivers/watchdog/Kconfig 
    171 =================================================================== 
    172 --- linux-2.6.25.7.orig/drivers/watchdog/Kconfig        2008-06-26 10:21:00.000000000 +0200 
    173 +++ linux-2.6.25.7/drivers/watchdog/Kconfig     2008-06-26 10:22:13.000000000 +0200 
     144--- a/drivers/watchdog/Kconfig 
     145+++ b/drivers/watchdog/Kconfig 
    174146@@ -670,6 +670,12 @@ 
    175147        help 
  • trunk/target/linux/ifxmips/patches/170-dma_hack.patch

    r11678 r11933  
    1 Index: linux-2.6.25.9/arch/mips/mm/cache.c 
    2 =================================================================== 
    3 --- linux-2.6.25.9.orig/arch/mips/mm/cache.c    2008-07-06 05:04:46.000000000 +0200 
    4 +++ linux-2.6.25.9/arch/mips/mm/cache.c 2008-07-06 05:05:07.000000000 +0200 
     1--- a/arch/mips/mm/cache.c 
     2+++ b/arch/mips/mm/cache.c 
    53@@ -50,6 +50,8 @@ 
    64 void (*_dma_cache_inv)(unsigned long start, unsigned long size); 
  • trunk/target/linux/ps3/Makefile

    r11667 r11933  
    1111BOARDNAME:=Sony PS3 Game Console 
    1212 
    13 LINUX_VERSION:=2.6.25.10 
     13LINUX_VERSION:=2.6.25.12 
    1414 
    1515KERNEL_CC:= 
  • trunk/target/linux/x86/Makefile

    r11667 r11933  
    1313SUBTARGETS=generic 
    1414 
    15 LINUX_VERSION:=2.6.25.10 
     15LINUX_VERSION:=2.6.25.12 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
Note: See TracChangeset for help on using the changeset viewer.