projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
set marvell switch ATU ageing time to minimum instead of maximum - hopefully fixes...
[openwrt.git] / target / linux / avr32 / patches / 100-git_sync.patch
diff --git a/target/linux/avr32/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch
index e2cf6ca..9c2d5dd 100644 (file)
--- a/target/linux/avr32/patches/100-git_sync.patch
+++ b/target/linux/avr32/patches/100-git_sync.patch
@@ -1,116 +1,5 @@
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/at91sam9261_devices.c avr32-2.6/arch/arm/mach-at91/at91sam9261_devices.c
---- linux-2.6.24.3/arch/arm/mach-at91/at91sam9261_devices.c    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/at91sam9261_devices.c 2008-04-23 20:12:35.000000000 +0200
-@@ -530,6 +530,20 @@
-       at91_set_B_periph(AT91_PIN_PB27, 0);    /* LCDD22 */
-       at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
- 
-+#ifdef CONFIG_FB_INTSRAM
-+      {
-+              void __iomem *fb;
-+              struct resource *fb_res = &lcdc_resources[2];
-+              size_t fb_len = fb_res->end - fb_res->start + 1;
-+
-+              fb = ioremap_writecombine(fb_res->start, fb_len);
-+              if (fb) {
-+                      memset(fb, 0, fb_len);
-+                      iounmap(fb, fb_len);
-+              }
-+      }
-+#endif
-+
-       lcdc_data = *data;
-       platform_device_register(&at91_lcdc_device);
- }
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/at91sam9rl_devices.c avr32-2.6/arch/arm/mach-at91/at91sam9rl_devices.c
---- linux-2.6.24.3/arch/arm/mach-at91/at91sam9rl_devices.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/at91sam9rl_devices.c  2008-04-23 20:12:35.000000000 +0200
-@@ -375,6 +375,20 @@
-       at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
-       at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
- 
-+#ifdef CONFIG_FB_INTSRAM
-+      {
-+              void __iomem *fb;
-+              struct resource *fb_res = &lcdc_resources[2];
-+              size_t fb_len = fb_res->end - fb_res->start + 1;
-+
-+              fb = ioremap_writecombine(fb_res->start, fb_len);
-+              if (fb) {
-+                      memset(fb, 0, fb_len);
-+                      iounmap(fb, fb_len);
-+              }
-+      }
-+#endif
-+
-       lcdc_data = *data;
-       platform_device_register(&at91_lcdc_device);
- }
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/board-sam9261ek.c avr32-2.6/arch/arm/mach-at91/board-sam9261ek.c
---- linux-2.6.24.3/arch/arm/mach-at91/board-sam9261ek.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/board-sam9261ek.c     2008-04-23 20:12:35.000000000 +0200
-@@ -322,6 +322,7 @@
- 
- /* Driver datas */
- static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .lcdcon_is_backlight            = true,
-       .default_bpp                    = 16,
-       .default_dmacon                 = ATMEL_LCDC_DMAEN,
-       .default_lcdcon2                = AT91SAM9261_DEFAULT_LCDCON2,
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/board-sam9263ek.c avr32-2.6/arch/arm/mach-at91/board-sam9263ek.c
---- linux-2.6.24.3/arch/arm/mach-at91/board-sam9263ek.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/board-sam9263ek.c     2008-04-23 20:12:35.000000000 +0200
-@@ -250,6 +250,7 @@
- 
- /* Driver datas */
- static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .lcdcon_is_backlight            = true,
-       .default_bpp                    = 16,
-       .default_dmacon                 = ATMEL_LCDC_DMAEN,
-       .default_lcdcon2                = AT91SAM9263_DEFAULT_LCDCON2,
-diff -urN linux-2.6.24.3/arch/arm/mach-at91/Kconfig avr32-2.6/arch/arm/mach-at91/Kconfig
---- linux-2.6.24.3/arch/arm/mach-at91/Kconfig  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/arm/mach-at91/Kconfig       2008-04-23 20:12:35.000000000 +0200
-@@ -219,6 +219,36 @@
-         Select this if you need to program one or more of the PCK0..PCK3
-         programmable clock outputs.
- 
-+choice
-+      prompt "Select a UART for early kernel messages"
-+
-+config AT91_EARLY_DBGU
-+      bool "DBGU"
-+
-+config AT91_EARLY_USART0
-+      bool "USART0"
-+
-+config AT91_EARLY_USART1
-+      bool "USART1"
-+
-+config AT91_EARLY_USART2
-+      bool "USART2"
-+      depends on ! ARCH_AT91X40
-+
-+config AT91_EARLY_USART3
-+      bool "USART3"
-+      depends on (ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9260)
-+
-+config AT91_EARLY_USART4
-+      bool "USART4"
-+      depends on ARCH_AT91SAM9260
-+
-+config AT91_EARLY_USART5
-+      bool "USART5"
-+      depends on ARCH_AT91SAM9260
-+
-+endchoice
-+
- endmenu
- 
- endif
-diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig avr32-2.6/arch/avr32/boards/atngw100/Kconfig
---- linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atngw100/Kconfig       2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/boards/atngw100/Kconfig
 @@ -0,0 +1,12 @@
 +# NGW100 customization
 +
 @@ -0,0 +1,12 @@
 +# NGW100 customization
 +
@@ -124,9 +13,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/Kconfig avr32-2.6/arch/avr32
 +
 +        Choose 'Y' here if you're having i2c-related problems and
 +        want to rule out the i2c bus driver.
 +
 +        Choose 'Y' here if you're having i2c-related problems and
 +        want to rule out the i2c bus driver.
-diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/setup.c avr32-2.6/arch/avr32/boards/atngw100/setup.c
---- linux-2.6.24.3/arch/avr32/boards/atngw100/setup.c  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atngw100/setup.c       2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/boards/atngw100/setup.c
++++ b/arch/avr32/boards/atngw100/setup.c
 @@ -20,7 +20,7 @@
  #include <asm/io.h>
  #include <asm/setup.h>
 @@ -20,7 +20,7 @@
  #include <asm/io.h>
  #include <asm/setup.h>
@@ -194,9 +82,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atngw100/setup.c avr32-2.6/arch/avr32
  
        return 0;
  }
  
        return 0;
  }
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1000.h avr32-2.6/arch/avr32/boards/atstk1000/atstk1000.h
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1000.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/atstk1000.h  2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/boards/atstk1000/atstk1000.h
++++ b/arch/avr32/boards/atstk1000/atstk1000.h
 @@ -12,4 +12,6 @@
  
  extern struct atmel_lcdfb_info atstk1000_lcdc_data;
 @@ -12,4 +12,6 @@
  
  extern struct atmel_lcdfb_info atstk1000_lcdc_data;
@@ -204,9 +91,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1000.h avr32-2.6/arch/
 +void atstk1000_setup_j2_leds(void);
 +
  #endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */
 +void atstk1000_setup_j2_leds(void);
 +
  #endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1002.c avr32-2.6/arch/avr32/boards/atstk1000/atstk1002.c
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1002.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/atstk1002.c  2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/boards/atstk1000/atstk1002.c
++++ b/arch/avr32/boards/atstk1000/atstk1002.c
 @@ -11,7 +11,6 @@
  #include <linux/etherdevice.h>
  #include <linux/init.h>
 @@ -11,7 +11,6 @@
  #include <linux/etherdevice.h>
  #include <linux/init.h>
@@ -433,9 +319,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1002.c avr32-2.6/arch/
        return 0;
  }
  postcore_initcall(atstk1002_init);
        return 0;
  }
  postcore_initcall(atstk1002_init);
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1003.c avr32-2.6/arch/avr32/boards/atstk1000/atstk1003.c
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1003.c     1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/atstk1003.c  2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/boards/atstk1000/atstk1003.c
 @@ -0,0 +1,185 @@
 +/*
 + * ATSTK1003 daughterboard-specific init code
 @@ -0,0 +1,185 @@
 +/*
 + * ATSTK1003 daughterboard-specific init code
@@ -622,9 +507,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1003.c avr32-2.6/arch/
 +      return 0;
 +}
 +postcore_initcall(atstk1003_init);
 +      return 0;
 +}
 +postcore_initcall(atstk1003_init);
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1004.c avr32-2.6/arch/avr32/boards/atstk1000/atstk1004.c
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1004.c     1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/atstk1004.c  2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/boards/atstk1000/atstk1004.c
 @@ -0,0 +1,156 @@
 +/*
 + * ATSTK1003 daughterboard-specific init code
 @@ -0,0 +1,156 @@
 +/*
 + * ATSTK1003 daughterboard-specific init code
@@ -782,9 +666,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/atstk1004.c avr32-2.6/arch/
 +      return 0;
 +}
 +postcore_initcall(atstk1004_init);
 +      return 0;
 +}
 +postcore_initcall(atstk1004_init);
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/Kconfig avr32-2.6/arch/avr32/boards/atstk1000/Kconfig
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/Kconfig 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/Kconfig      2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/boards/atstk1000/Kconfig
++++ b/arch/avr32/boards/atstk1000/Kconfig
 @@ -1,34 +1,53 @@
  # STK1000 customization
  
 @@ -1,34 +1,53 @@
  # STK1000 customization
  
@@ -963,17 +846,15 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/Kconfig avr32-2.6/arch/avr3
 +        operating on 3.3 volt.
 +
 +endif # stk 1000
 +        operating on 3.3 volt.
 +
 +endif # stk 1000
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/Makefile avr32-2.6/arch/avr32/boards/atstk1000/Makefile
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/Makefile        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/Makefile     2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/boards/atstk1000/Makefile
++++ b/arch/avr32/boards/atstk1000/Makefile
 @@ -1,2 +1,4 @@
  obj-y                         += setup.o flash.o
  obj-$(CONFIG_BOARD_ATSTK1002) += atstk1002.o
 +obj-$(CONFIG_BOARD_ATSTK1003) += atstk1003.o
 +obj-$(CONFIG_BOARD_ATSTK1004) += atstk1004.o
 @@ -1,2 +1,4 @@
  obj-y                         += setup.o flash.o
  obj-$(CONFIG_BOARD_ATSTK1002) += atstk1002.o
 +obj-$(CONFIG_BOARD_ATSTK1003) += atstk1003.o
 +obj-$(CONFIG_BOARD_ATSTK1004) += atstk1004.o
-diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/setup.c avr32-2.6/arch/avr32/boards/atstk1000/setup.c
---- linux-2.6.24.3/arch/avr32/boards/atstk1000/setup.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/boards/atstk1000/setup.c      2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/boards/atstk1000/setup.c
++++ b/arch/avr32/boards/atstk1000/setup.c
 @@ -10,13 +10,17 @@
  #include <linux/bootmem.h>
  #include <linux/fb.h>
 @@ -10,13 +10,17 @@
  #include <linux/bootmem.h>
  #include <linux/fb.h>
@@ -1056,9 +937,8 @@ diff -urN linux-2.6.24.3/arch/avr32/boards/atstk1000/setup.c avr32-2.6/arch/avr3
 +
 +}
 +#endif /* CONFIG_BOARD_ATSTK1000_J2_LED */
 +
 +}
 +#endif /* CONFIG_BOARD_ATSTK1000_J2_LED */
-diff -urN linux-2.6.24.3/arch/avr32/configs/atngw100_defconfig avr32-2.6/arch/avr32/configs/atngw100_defconfig
---- linux-2.6.24.3/arch/avr32/configs/atngw100_defconfig       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/configs/atngw100_defconfig    2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/configs/atngw100_defconfig
++++ b/arch/avr32/configs/atngw100_defconfig
 @@ -1,46 +1,52 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,46 +1,52 @@
  #
  # Automatically generated make config: don't edit
@@ -1961,9 +1841,8 @@ diff -urN linux-2.6.24.3/arch/avr32/configs/atngw100_defconfig avr32-2.6/arch/av
  # CONFIG_LIBCRC32C is not set
  CONFIG_ZLIB_INFLATE=y
  CONFIG_ZLIB_DEFLATE=y
  # CONFIG_LIBCRC32C is not set
  CONFIG_ZLIB_INFLATE=y
  CONFIG_ZLIB_DEFLATE=y
-diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1002_defconfig avr32-2.6/arch/avr32/configs/atstk1002_defconfig
---- linux-2.6.24.3/arch/avr32/configs/atstk1002_defconfig      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/configs/atstk1002_defconfig   2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/configs/atstk1002_defconfig
++++ b/arch/avr32/configs/atstk1002_defconfig
 @@ -1,48 +1,49 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,48 +1,49 @@
  #
  # Automatically generated make config: don't edit
@@ -3069,9 +2948,8 @@ diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1002_defconfig avr32-2.6/arch/a
  CONFIG_ZLIB_INFLATE=y
  CONFIG_ZLIB_DEFLATE=y
  CONFIG_PLIST=y
  CONFIG_ZLIB_INFLATE=y
  CONFIG_ZLIB_DEFLATE=y
  CONFIG_PLIST=y
-diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1003_defconfig avr32-2.6/arch/avr32/configs/atstk1003_defconfig
---- linux-2.6.24.3/arch/avr32/configs/atstk1003_defconfig      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/configs/atstk1003_defconfig   2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/configs/atstk1003_defconfig
 @@ -0,0 +1,1041 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1041 @@
 +#
 +# Automatically generated make config: don't edit
@@ -4114,9 +3992,8 @@ diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1003_defconfig avr32-2.6/arch/a
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_IOPORT=y
 +CONFIG_HAS_DMA=y
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_IOPORT=y
 +CONFIG_HAS_DMA=y
-diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1004_defconfig avr32-2.6/arch/avr32/configs/atstk1004_defconfig
---- linux-2.6.24.3/arch/avr32/configs/atstk1004_defconfig      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/configs/atstk1004_defconfig   2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/configs/atstk1004_defconfig
 @@ -0,0 +1,639 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,639 @@
 +#
 +# Automatically generated make config: don't edit
@@ -4757,9 +4634,8 @@ diff -urN linux-2.6.24.3/arch/avr32/configs/atstk1004_defconfig avr32-2.6/arch/a
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_IOPORT=y
 +CONFIG_HAS_DMA=y
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_IOPORT=y
 +CONFIG_HAS_DMA=y
-diff -urN linux-2.6.24.3/arch/avr32/drivers/dw-dmac.c avr32-2.6/arch/avr32/drivers/dw-dmac.c
---- linux-2.6.24.3/arch/avr32/drivers/dw-dmac.c        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/drivers/dw-dmac.c     2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/drivers/dw-dmac.c
 @@ -0,0 +1,761 @@
 +/*
 + * Driver for the Synopsys DesignWare DMA Controller
 @@ -0,0 +1,761 @@
 +/*
 + * Driver for the Synopsys DesignWare DMA Controller
@@ -5522,9 +5398,8 @@ diff -urN linux-2.6.24.3/arch/avr32/drivers/dw-dmac.c avr32-2.6/arch/avr32/drive
 +MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/arch/avr32/drivers/dw-dmac.h avr32-2.6/arch/avr32/drivers/dw-dmac.h
---- linux-2.6.24.3/arch/avr32/drivers/dw-dmac.h        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/drivers/dw-dmac.h     2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/drivers/dw-dmac.h
 @@ -0,0 +1,42 @@
 +/*
 + * Driver for the Synopsys DesignWare DMA Controller
 @@ -0,0 +1,42 @@
 +/*
 + * Driver for the Synopsys DesignWare DMA Controller
@@ -5568,14 +5443,12 @@ diff -urN linux-2.6.24.3/arch/avr32/drivers/dw-dmac.h avr32-2.6/arch/avr32/drive
 +#define DW_DMAC_CHAN_DSR      0x050
 +
 +#endif /* __AVR32_DW_DMAC_H__ */
 +#define DW_DMAC_CHAN_DSR      0x050
 +
 +#endif /* __AVR32_DW_DMAC_H__ */
-diff -urN linux-2.6.24.3/arch/avr32/drivers/Makefile avr32-2.6/arch/avr32/drivers/Makefile
---- linux-2.6.24.3/arch/avr32/drivers/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/drivers/Makefile      2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/drivers/Makefile
 @@ -0,0 +1 @@
 +obj-$(CONFIG_DW_DMAC)                 += dw-dmac.o
 @@ -0,0 +1 @@
 +obj-$(CONFIG_DW_DMAC)                 += dw-dmac.o
-diff -urN linux-2.6.24.3/arch/avr32/Kconfig avr32-2.6/arch/avr32/Kconfig
---- linux-2.6.24.3/arch/avr32/Kconfig  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/Kconfig       2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/Kconfig
++++ b/arch/avr32/Kconfig
 @@ -45,6 +45,9 @@
  config GENERIC_TIME
        def_bool y
 @@ -45,6 +45,9 @@
  config GENERIC_TIME
        def_bool y
@@ -5708,9 +5581,8 @@ diff -urN linux-2.6.24.3/arch/avr32/Kconfig avr32-2.6/arch/avr32/Kconfig
  source "arch/avr32/Kconfig.debug"
  
  source "security/Kconfig"
  source "arch/avr32/Kconfig.debug"
  
  source "security/Kconfig"
-diff -urN linux-2.6.24.3/arch/avr32/Kconfig.debug avr32-2.6/arch/avr32/Kconfig.debug
---- linux-2.6.24.3/arch/avr32/Kconfig.debug    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/Kconfig.debug 2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/Kconfig.debug
++++ b/arch/avr32/Kconfig.debug
 @@ -6,14 +6,4 @@
  
  source "lib/Kconfig.debug"
 @@ -6,14 +6,4 @@
  
  source "lib/Kconfig.debug"
@@ -5726,9 +5598,8 @@ diff -urN linux-2.6.24.3/arch/avr32/Kconfig.debug avr32-2.6/arch/avr32/Kconfig.d
 -          If in doubt, say "N".
 -
  endmenu
 -          If in doubt, say "N".
 -
  endmenu
-diff -urN linux-2.6.24.3/arch/avr32/kernel/cpu.c avr32-2.6/arch/avr32/kernel/cpu.c
---- linux-2.6.24.3/arch/avr32/kernel/cpu.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/cpu.c  2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/cpu.c
++++ b/arch/avr32/kernel/cpu.c
 @@ -13,6 +13,7 @@
  #include <linux/percpu.h>
  #include <linux/param.h>
 @@ -13,6 +13,7 @@
  #include <linux/percpu.h>
  #include <linux/param.h>
@@ -5921,9 +5792,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/cpu.c avr32-2.6/arch/avr32/kernel/cpu
        .start  = c_start,
        .next   = c_next,
        .stop   = c_stop,
        .start  = c_start,
        .next   = c_next,
        .stop   = c_stop,
-diff -urN linux-2.6.24.3/arch/avr32/kernel/dma-controller.c avr32-2.6/arch/avr32/kernel/dma-controller.c
---- linux-2.6.24.3/arch/avr32/kernel/dma-controller.c  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/dma-controller.c       2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/kernel/dma-controller.c
 @@ -0,0 +1,34 @@
 +/*
 + * Preliminary DMA controller framework for AVR32
 @@ -0,0 +1,34 @@
 +/*
 + * Preliminary DMA controller framework for AVR32
@@ -5959,9 +5829,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/dma-controller.c avr32-2.6/arch/avr32
 +      return NULL;
 +}
 +EXPORT_SYMBOL(find_dma_controller);
 +      return NULL;
 +}
 +EXPORT_SYMBOL(find_dma_controller);
-diff -urN linux-2.6.24.3/arch/avr32/kernel/entry-avr32b.S avr32-2.6/arch/avr32/kernel/entry-avr32b.S
---- linux-2.6.24.3/arch/avr32/kernel/entry-avr32b.S    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/entry-avr32b.S 2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/kernel/entry-avr32b.S
++++ b/arch/avr32/kernel/entry-avr32b.S
 @@ -741,26 +741,6 @@
  
        .section .irq.text,"ax",@progbits
 @@ -741,26 +741,6 @@
  
        .section .irq.text,"ax",@progbits
@@ -5989,9 +5858,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/entry-avr32b.S avr32-2.6/arch/avr32/k
        .global irq_level0
        .global irq_level1
        .global irq_level2
        .global irq_level0
        .global irq_level1
        .global irq_level2
-diff -urN linux-2.6.24.3/arch/avr32/kernel/irq.c avr32-2.6/arch/avr32/kernel/irq.c
---- linux-2.6.24.3/arch/avr32/kernel/irq.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/irq.c  2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/irq.c
++++ b/arch/avr32/kernel/irq.c
 @@ -25,6 +25,17 @@
        printk("unexpected IRQ %u\n", irq);
  }
 @@ -25,6 +25,17 @@
        printk("unexpected IRQ %u\n", irq);
  }
@@ -6010,9 +5878,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/irq.c avr32-2.6/arch/avr32/kernel/irq
  #ifdef CONFIG_PROC_FS
  int show_interrupts(struct seq_file *p, void *v)
  {
  #ifdef CONFIG_PROC_FS
  int show_interrupts(struct seq_file *p, void *v)
  {
-diff -urN linux-2.6.24.3/arch/avr32/kernel/kprobes.c avr32-2.6/arch/avr32/kernel/kprobes.c
---- linux-2.6.24.3/arch/avr32/kernel/kprobes.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/kprobes.c      2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/kprobes.c
++++ b/arch/avr32/kernel/kprobes.c
 @@ -48,6 +48,7 @@
  void __kprobes arch_arm_kprobe(struct kprobe *p)
  {
 @@ -48,6 +48,7 @@
  void __kprobes arch_arm_kprobe(struct kprobe *p)
  {
@@ -6039,9 +5906,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/kprobes.c avr32-2.6/arch/avr32/kernel
        /* TODO: Register kretprobe trampoline */
        return 0;
  }
        /* TODO: Register kretprobe trampoline */
        return 0;
  }
-diff -urN linux-2.6.24.3/arch/avr32/kernel/Makefile avr32-2.6/arch/avr32/kernel/Makefile
---- linux-2.6.24.3/arch/avr32/kernel/Makefile  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/Makefile       2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/Makefile
++++ b/arch/avr32/kernel/Makefile
 @@ -6,9 +6,11 @@
  
  obj-$(CONFIG_SUBARCH_AVR32B)  += entry-avr32b.o
 @@ -6,9 +6,11 @@
  
  obj-$(CONFIG_SUBARCH_AVR32B)  += entry-avr32b.o
@@ -6055,9 +5921,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/Makefile avr32-2.6/arch/avr32/kernel/
  obj-$(CONFIG_KPROBES)         += kprobes.o
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
 +obj-$(CONFIG_NMI_DEBUGGING)   += nmi_debug.o
  obj-$(CONFIG_KPROBES)         += kprobes.o
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
 +obj-$(CONFIG_NMI_DEBUGGING)   += nmi_debug.o
-diff -urN linux-2.6.24.3/arch/avr32/kernel/nmi_debug.c avr32-2.6/arch/avr32/kernel/nmi_debug.c
---- linux-2.6.24.3/arch/avr32/kernel/nmi_debug.c       1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/nmi_debug.c    2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/kernel/nmi_debug.c
 @@ -0,0 +1,82 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
 @@ -0,0 +1,82 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
@@ -6141,9 +6006,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/nmi_debug.c avr32-2.6/arch/avr32/kern
 +      return 0;
 +}
 +__setup("nmi_debug", nmi_debug_setup);
 +      return 0;
 +}
 +__setup("nmi_debug", nmi_debug_setup);
-diff -urN linux-2.6.24.3/arch/avr32/kernel/ocd.c avr32-2.6/arch/avr32/kernel/ocd.c
---- linux-2.6.24.3/arch/avr32/kernel/ocd.c     1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/ocd.c  2008-04-23 19:33:28.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/kernel/ocd.c
 @@ -0,0 +1,163 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
 @@ -0,0 +1,163 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
@@ -6308,9 +6172,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/ocd.c avr32-2.6/arch/avr32/kernel/ocd
 +      return 0;
 +}
 +arch_initcall(ocd_init);
 +      return 0;
 +}
 +arch_initcall(ocd_init);
-diff -urN linux-2.6.24.3/arch/avr32/kernel/process.c avr32-2.6/arch/avr32/kernel/process.c
---- linux-2.6.24.3/arch/avr32/kernel/process.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/process.c      2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/kernel/process.c
++++ b/arch/avr32/kernel/process.c
 @@ -11,17 +11,18 @@
  #include <linux/fs.h>
  #include <linux/ptrace.h>
 @@ -11,17 +11,18 @@
  #include <linux/fs.h>
  #include <linux/ptrace.h>
@@ -6363,9 +6226,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/process.c avr32-2.6/arch/avr32/kernel
        return 0;
  }
  
        return 0;
  }
  
-diff -urN linux-2.6.24.3/arch/avr32/kernel/ptrace.c avr32-2.6/arch/avr32/kernel/ptrace.c
---- linux-2.6.24.3/arch/avr32/kernel/ptrace.c  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/ptrace.c       2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/ptrace.c
++++ b/arch/avr32/kernel/ptrace.c
 @@ -58,6 +58,7 @@
  {
        clear_tsk_thread_flag(child, TIF_SINGLE_STEP);
 @@ -58,6 +58,7 @@
  {
        clear_tsk_thread_flag(child, TIF_SINGLE_STEP);
@@ -6385,9 +6247,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/ptrace.c avr32-2.6/arch/avr32/kernel/
        switch (request) {
        /* Read the word at location addr in the child process */
        case PTRACE_PEEKTEXT:
        switch (request) {
        /* Read the word at location addr in the child process */
        case PTRACE_PEEKTEXT:
-diff -urN linux-2.6.24.3/arch/avr32/kernel/setup.c avr32-2.6/arch/avr32/kernel/setup.c
---- linux-2.6.24.3/arch/avr32/kernel/setup.c   2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/setup.c        2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/kernel/setup.c
++++ b/arch/avr32/kernel/setup.c
 @@ -273,6 +273,8 @@
                        printk(KERN_WARNING
                               "Failed to allocate framebuffer memory\n");
 @@ -273,6 +273,8 @@
                        printk(KERN_WARNING
                               "Failed to allocate framebuffer memory\n");
@@ -6397,9 +6258,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/setup.c avr32-2.6/arch/avr32/kernel/s
                }
        }
  
                }
        }
  
-diff -urN linux-2.6.24.3/arch/avr32/kernel/signal.c avr32-2.6/arch/avr32/kernel/signal.c
---- linux-2.6.24.3/arch/avr32/kernel/signal.c  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/signal.c       2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/signal.c
++++ b/arch/avr32/kernel/signal.c
 @@ -270,19 +270,12 @@
        if (!user_mode(regs))
                return 0;
 @@ -270,19 +270,12 @@
        if (!user_mode(regs))
                return 0;
@@ -6420,9 +6280,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/signal.c avr32-2.6/arch/avr32/kernel/
        if (syscall) {
                switch (regs->r12) {
                case -ERESTART_RESTARTBLOCK:
        if (syscall) {
                switch (regs->r12) {
                case -ERESTART_RESTARTBLOCK:
-diff -urN linux-2.6.24.3/arch/avr32/kernel/time.c avr32-2.6/arch/avr32/kernel/time.c
---- linux-2.6.24.3/arch/avr32/kernel/time.c    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/time.c 2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/kernel/time.c
++++ b/arch/avr32/kernel/time.c
 @@ -1,16 +1,12 @@
  /*
   * Copyright (C) 2004-2007 Atmel Corporation
 @@ -1,16 +1,12 @@
  /*
   * Copyright (C) 2004-2007 Atmel Corporation
@@ -6733,9 +6592,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/time.c avr32-2.6/arch/avr32/kernel/ti
  }
 -
 -device_initcall(init_timer_sysfs);
  }
 -
 -device_initcall(init_timer_sysfs);
-diff -urN linux-2.6.24.3/arch/avr32/kernel/traps.c avr32-2.6/arch/avr32/kernel/traps.c
---- linux-2.6.24.3/arch/avr32/kernel/traps.c   2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/kernel/traps.c        2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/kernel/traps.c
++++ b/arch/avr32/kernel/traps.c
 @@ -9,6 +9,7 @@
  #include <linux/bug.h>
  #include <linux/init.h>
 @@ -9,6 +9,7 @@
  #include <linux/bug.h>
  #include <linux/init.h>
@@ -6771,9 +6629,8 @@ diff -urN linux-2.6.24.3/arch/avr32/kernel/traps.c avr32-2.6/arch/avr32/kernel/t
  }
  
  asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs)
  }
  
  asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs)
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap7000.c avr32-2.6/arch/avr32/mach-at32ap/at32ap7000.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap7000.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/at32ap7000.c      1970-01-01 01:00:00.000000000 +0100
+--- a/arch/avr32/mach-at32ap/at32ap7000.c
++++ /dev/null
 @@ -1,1730 +0,0 @@
 -/*
 - * Copyright (C) 2005-2006 Atmel Corporation
 @@ -1,1730 +0,0 @@
 -/*
 - * Copyright (C) 2005-2006 Atmel Corporation
@@ -8505,9 +8362,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap7000.c avr32-2.6/arch/avr3
 -      pm_writel(PBA_MASK, pba_mask);
 -      pm_writel(PBB_MASK, pbb_mask);
 -}
 -      pm_writel(PBA_MASK, pba_mask);
 -      pm_writel(PBB_MASK, pbb_mask);
 -}
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap700x.c avr32-2.6/arch/avr32/mach-at32ap/at32ap700x.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap700x.c 1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/at32ap700x.c      2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/mach-at32ap/at32ap700x.c
 @@ -0,0 +1,1944 @@
 +/*
 + * Copyright (C) 2005-2006 Atmel Corporation
 @@ -0,0 +1,1944 @@
 +/*
 + * Copyright (C) 2005-2006 Atmel Corporation
@@ -10453,9 +10309,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/at32ap700x.c avr32-2.6/arch/avr3
 +      pm_writel(PBA_MASK, pba_mask);
 +      pm_writel(PBB_MASK, pbb_mask);
 +}
 +      pm_writel(PBA_MASK, pba_mask);
 +      pm_writel(PBB_MASK, pbb_mask);
 +}
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/extint.c avr32-2.6/arch/avr32/mach-at32ap/extint.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/extint.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/extint.c  2008-04-23 19:33:29.000000000 +0200
+--- a/arch/avr32/mach-at32ap/extint.c
++++ b/arch/avr32/mach-at32ap/extint.c
 @@ -26,16 +26,10 @@
  #define EIC_MODE                              0x0014
  #define EIC_EDGE                              0x0018
 @@ -26,16 +26,10 @@
  #define EIC_MODE                              0x0014
  #define EIC_EDGE                              0x0018
@@ -10577,9 +10432,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/extint.c avr32-2.6/arch/avr32/ma
        dev_info(&pdev->dev,
                 "External Interrupt Controller at 0x%p, IRQ %u\n",
                 eic->regs, int_irq);
        dev_info(&pdev->dev,
                 "External Interrupt Controller at 0x%p, IRQ %u\n",
                 eic->regs, int_irq);
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/gpio-dev.c avr32-2.6/arch/avr32/mach-at32ap/gpio-dev.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/gpio-dev.c   1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/gpio-dev.c        2008-04-23 19:33:29.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/mach-at32ap/gpio-dev.c
 @@ -0,0 +1,573 @@
 +/*
 + * GPIO /dev and configfs interface
 @@ -0,0 +1,573 @@
 +/*
 + * GPIO /dev and configfs interface
@@ -11154,9 +11008,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/gpio-dev.c avr32-2.6/arch/avr32/
 +      return err;
 +}
 +late_initcall(gpio_dev_init);
 +      return err;
 +}
 +late_initcall(gpio_dev_init);
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/intc.c avr32-2.6/arch/avr32/mach-at32ap/intc.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/intc.c       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/intc.c    2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/mach-at32ap/intc.c
++++ b/arch/avr32/mach-at32ap/intc.c
 @@ -13,7 +13,6 @@
  #include <linux/irq.h>
  #include <linux/platform_device.h>
 @@ -13,7 +13,6 @@
  #include <linux/irq.h>
  #include <linux/platform_device.h>
@@ -11165,9 +11018,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/intc.c avr32-2.6/arch/avr32/mach
  #include <asm/io.h>
  
  #include "intc.h"
  #include <asm/io.h>
  
  #include "intc.h"
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/Kconfig avr32-2.6/arch/avr32/mach-at32ap/Kconfig
---- linux-2.6.24.3/arch/avr32/mach-at32ap/Kconfig      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/Kconfig   2008-04-23 19:33:29.000000000 +0200
+--- a/arch/avr32/mach-at32ap/Kconfig
++++ b/arch/avr32/mach-at32ap/Kconfig
 @@ -3,9 +3,9 @@
  menu "Atmel AVR32 AP options"
  
 @@ -3,9 +3,9 @@
  menu "Atmel AVR32 AP options"
  
@@ -11209,9 +11061,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/Kconfig avr32-2.6/arch/avr32/mac
  endmenu
  
  endif # PLATFORM_AT32AP
  endmenu
  
  endif # PLATFORM_AT32AP
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/Makefile avr32-2.6/arch/avr32/mach-at32ap/Makefile
---- linux-2.6.24.3/arch/avr32/mach-at32ap/Makefile     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/Makefile  2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/mach-at32ap/Makefile
++++ b/arch/avr32/mach-at32ap/Makefile
 @@ -1,4 +1,4 @@
  obj-y                         += at32ap.o clock.o intc.o extint.o pio.o hsmc.o
 -obj-$(CONFIG_CPU_AT32AP7000)  += at32ap7000.o
 @@ -1,4 +1,4 @@
  obj-y                         += at32ap.o clock.o intc.o extint.o pio.o hsmc.o
 -obj-$(CONFIG_CPU_AT32AP7000)  += at32ap7000.o
@@ -11219,9 +11070,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/Makefile avr32-2.6/arch/avr32/ma
 +obj-$(CONFIG_CPU_AT32AP700X)  += at32ap700x.o pm-at32ap700x.o
  obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o
 +obj-$(CONFIG_GPIO_DEV)                += gpio-dev.o
 +obj-$(CONFIG_CPU_AT32AP700X)  += at32ap700x.o pm-at32ap700x.o
  obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o
 +obj-$(CONFIG_GPIO_DEV)                += gpio-dev.o
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/pio.c avr32-2.6/arch/avr32/mach-at32ap/pio.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/pio.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/pio.c     2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/mach-at32ap/pio.c
++++ b/arch/avr32/mach-at32ap/pio.c
 @@ -162,6 +162,82 @@
        dump_stack();
  }
 @@ -162,6 +162,82 @@
        dump_stack();
  }
@@ -11305,9 +11155,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/pio.c avr32-2.6/arch/avr32/mach-
  /*--------------------------------------------------------------------------*/
  
  /* GPIO API */
  /*--------------------------------------------------------------------------*/
  
  /* GPIO API */
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/pm-at32ap700x.S avr32-2.6/arch/avr32/mach-at32ap/pm-at32ap700x.S
---- linux-2.6.24.3/arch/avr32/mach-at32ap/pm-at32ap700x.S      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/pm-at32ap700x.S   2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/mach-at32ap/pm-at32ap700x.S
 @@ -0,0 +1,66 @@
 +/*
 + * Low-level Power Management code.
 @@ -0,0 +1,66 @@
 +/*
 + * Low-level Power Management code.
@@ -11375,9 +11224,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/pm-at32ap700x.S avr32-2.6/arch/a
 +      unmask_interrupts
 +      retal   r12
 +      .size   cpu_idle_skip_sleep, . - cpu_idle_skip_sleep
 +      unmask_interrupts
 +      retal   r12
 +      .size   cpu_idle_skip_sleep, . - cpu_idle_skip_sleep
-diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/time-tc.c avr32-2.6/arch/avr32/mach-at32ap/time-tc.c
---- linux-2.6.24.3/arch/avr32/mach-at32ap/time-tc.c    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mach-at32ap/time-tc.c 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/avr32/mach-at32ap/time-tc.c
++++ /dev/null
 @@ -1,218 +0,0 @@
 -/*
 - * Copyright (C) 2004-2007 Atmel Corporation
 @@ -1,218 +0,0 @@
 -/*
 - * Copyright (C) 2004-2007 Atmel Corporation
@@ -11597,9 +11445,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mach-at32ap/time-tc.c avr32-2.6/arch/avr32/m
 -
 -      return IRQ_NONE;
 -}
 -
 -      return IRQ_NONE;
 -}
-diff -urN linux-2.6.24.3/arch/avr32/Makefile avr32-2.6/arch/avr32/Makefile
---- linux-2.6.24.3/arch/avr32/Makefile 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/Makefile      2008-04-23 19:33:28.000000000 +0200
+--- a/arch/avr32/Makefile
++++ b/arch/avr32/Makefile
 @@ -16,7 +16,7 @@
  CFLAGS_MODULE += -mno-relax
  LDFLAGS_vmlinux       += --relax
 @@ -16,7 +16,7 @@
  CFLAGS_MODULE += -mno-relax
  LDFLAGS_vmlinux       += --relax
@@ -11618,9 +11465,8 @@ diff -urN linux-2.6.24.3/arch/avr32/Makefile avr32-2.6/arch/avr32/Makefile
  libs-y                                        += arch/avr32/lib/
  
  archincdir-$(CONFIG_PLATFORM_AT32AP)  := arch-at32ap
  libs-y                                        += arch/avr32/lib/
  
  archincdir-$(CONFIG_PLATFORM_AT32AP)  := arch-at32ap
-diff -urN linux-2.6.24.3/arch/avr32/mm/dma-coherent.c avr32-2.6/arch/avr32/mm/dma-coherent.c
---- linux-2.6.24.3/arch/avr32/mm/dma-coherent.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mm/dma-coherent.c     2008-04-23 19:33:29.000000000 +0200
+--- a/arch/avr32/mm/dma-coherent.c
++++ b/arch/avr32/mm/dma-coherent.c
 @@ -41,6 +41,13 @@
        struct page *page, *free, *end;
        int order;
 @@ -41,6 +41,13 @@
        struct page *page, *free, *end;
        int order;
@@ -11635,9 +11481,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mm/dma-coherent.c avr32-2.6/arch/avr32/mm/dm
        size = PAGE_ALIGN(size);
        order = get_order(size);
  
        size = PAGE_ALIGN(size);
        order = get_order(size);
  
-diff -urN linux-2.6.24.3/arch/avr32/mm/fault.c avr32-2.6/arch/avr32/mm/fault.c
---- linux-2.6.24.3/arch/avr32/mm/fault.c       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mm/fault.c    2008-04-23 20:12:35.000000000 +0200
+--- a/arch/avr32/mm/fault.c
++++ b/arch/avr32/mm/fault.c
 @@ -189,6 +189,8 @@
  
        page = sysreg_read(PTBR);
 @@ -189,6 +189,8 @@
  
        page = sysreg_read(PTBR);
@@ -11647,9 +11492,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mm/fault.c avr32-2.6/arch/avr32/mm/fault.c
        if (page) {
                page = ((unsigned long *)page)[address >> 22];
                printk(" pgd = %08lx", page);
        if (page) {
                page = ((unsigned long *)page)[address >> 22];
                printk(" pgd = %08lx", page);
-diff -urN linux-2.6.24.3/arch/avr32/mm/tlb.c avr32-2.6/arch/avr32/mm/tlb.c
---- linux-2.6.24.3/arch/avr32/mm/tlb.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/arch/avr32/mm/tlb.c      2008-04-23 19:33:29.000000000 +0200
+--- a/arch/avr32/mm/tlb.c
++++ b/arch/avr32/mm/tlb.c
 @@ -348,7 +348,7 @@
        return 0;
  }
 @@ -348,7 +348,7 @@
        return 0;
  }
@@ -11659,9 +11503,8 @@ diff -urN linux-2.6.24.3/arch/avr32/mm/tlb.c avr32-2.6/arch/avr32/mm/tlb.c
        .start          = tlb_start,
        .next           = tlb_next,
        .stop           = tlb_stop,
        .start          = tlb_start,
        .next           = tlb_next,
        .stop           = tlb_stop,
-diff -urN linux-2.6.24.3/arch/avr32/oprofile/Makefile avr32-2.6/arch/avr32/oprofile/Makefile
---- linux-2.6.24.3/arch/avr32/oprofile/Makefile        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/oprofile/Makefile     2008-04-23 19:33:29.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/oprofile/Makefile
 @@ -0,0 +1,8 @@
 +obj-$(CONFIG_OPROFILE) += oprofile.o
 +
 @@ -0,0 +1,8 @@
 +obj-$(CONFIG_OPROFILE) += oprofile.o
 +
@@ -11671,9 +11514,8 @@ diff -urN linux-2.6.24.3/arch/avr32/oprofile/Makefile avr32-2.6/arch/avr32/oprof
 +                              oprofilefs.o oprofile_stats.o           \
 +                              timer_int.o)
 +oprofile-y            += op_model_avr32.o
 +                              oprofilefs.o oprofile_stats.o           \
 +                              timer_int.o)
 +oprofile-y            += op_model_avr32.o
-diff -urN linux-2.6.24.3/arch/avr32/oprofile/op_model_avr32.c avr32-2.6/arch/avr32/oprofile/op_model_avr32.c
---- linux-2.6.24.3/arch/avr32/oprofile/op_model_avr32.c        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/arch/avr32/oprofile/op_model_avr32.c     2008-04-23 20:12:35.000000000 +0200
+--- /dev/null
++++ b/arch/avr32/oprofile/op_model_avr32.c
 @@ -0,0 +1,234 @@
 +/*
 + * AVR32 Performance Counter Driver
 @@ -0,0 +1,234 @@
 +/*
 + * AVR32 Performance Counter Driver
@@ -11909,9 +11751,8 @@ diff -urN linux-2.6.24.3/arch/avr32/oprofile/op_model_avr32.c avr32-2.6/arch/avr
 +{
 +
 +}
 +{
 +
 +}
-diff -urN linux-2.6.24.3/Documentation/kernel-parameters.txt avr32-2.6/Documentation/kernel-parameters.txt
---- linux-2.6.24.3/Documentation/kernel-parameters.txt 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/Documentation/kernel-parameters.txt      2008-04-23 20:12:35.000000000 +0200
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
 @@ -34,6 +34,7 @@
        ALSA    ALSA sound support is enabled.
        APIC    APIC support is enabled.
 @@ -34,6 +34,7 @@
        ALSA    ALSA sound support is enabled.
        APIC    APIC support is enabled.
@@ -11920,7 +11761,7 @@ diff -urN linux-2.6.24.3/Documentation/kernel-parameters.txt avr32-2.6/Documenta
        AX25    Appropriate AX.25 support is enabled.
        BLACKFIN Blackfin architecture is enabled.
        DRM     Direct Rendering Management support is enabled.
        AX25    Appropriate AX.25 support is enabled.
        BLACKFIN Blackfin architecture is enabled.
        DRM     Direct Rendering Management support is enabled.
-@@ -1123,6 +1124,10 @@
+@@ -1124,6 +1125,10 @@
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
  
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
  
@@ -11931,17 +11772,15 @@ diff -urN linux-2.6.24.3/Documentation/kernel-parameters.txt avr32-2.6/Documenta
        nmi_watchdog=   [KNL,BUGS=X86-32] Debugging features for SMP kernels
  
        no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
        nmi_watchdog=   [KNL,BUGS=X86-32] Debugging features for SMP kernels
  
        no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
-diff -urN linux-2.6.24.3/drivers/clocksource/Makefile avr32-2.6/drivers/clocksource/Makefile
---- linux-2.6.24.3/drivers/clocksource/Makefile        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/clocksource/Makefile     2008-04-23 20:12:39.000000000 +0200
+--- a/drivers/clocksource/Makefile
++++ b/drivers/clocksource/Makefile
 @@ -1,3 +1,4 @@
 +obj-$(CONFIG_ATMEL_TCB_CLKSRC)        += tcb_clksrc.o
  obj-$(CONFIG_X86_CYCLONE_TIMER)       += cyclone.o
  obj-$(CONFIG_X86_PM_TIMER)    += acpi_pm.o
  obj-$(CONFIG_SCx200HR_TIMER)  += scx200_hrt.o
 @@ -1,3 +1,4 @@
 +obj-$(CONFIG_ATMEL_TCB_CLKSRC)        += tcb_clksrc.o
  obj-$(CONFIG_X86_CYCLONE_TIMER)       += cyclone.o
  obj-$(CONFIG_X86_PM_TIMER)    += acpi_pm.o
  obj-$(CONFIG_SCx200HR_TIMER)  += scx200_hrt.o
-diff -urN linux-2.6.24.3/drivers/clocksource/tcb_clksrc.c avr32-2.6/drivers/clocksource/tcb_clksrc.c
---- linux-2.6.24.3/drivers/clocksource/tcb_clksrc.c    1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/clocksource/tcb_clksrc.c 2008-04-23 20:12:39.000000000 +0200
+--- /dev/null
++++ b/drivers/clocksource/tcb_clksrc.c
 @@ -0,0 +1,305 @@
 +#include <linux/init.h>
 +#include <linux/clocksource.h>
 @@ -0,0 +1,305 @@
 +#include <linux/init.h>
 +#include <linux/clocksource.h>
@@ -12248,9 +12087,8 @@ diff -urN linux-2.6.24.3/drivers/clocksource/tcb_clksrc.c avr32-2.6/drivers/cloc
 +      return 0;
 +}
 +arch_initcall(tcb_clksrc_init);
 +      return 0;
 +}
 +arch_initcall(tcb_clksrc_init);
-diff -urN linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.c avr32-2.6/drivers/i2c/busses/i2c-atmeltwi.c
---- linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.c   1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/i2c/busses/i2c-atmeltwi.c        2008-04-23 19:33:37.000000000 +0200
+--- /dev/null
++++ b/drivers/i2c/busses/i2c-atmeltwi.c
 @@ -0,0 +1,436 @@
 +/*
 + * i2c Support for Atmel's Two-Wire Interface (TWI)
 @@ -0,0 +1,436 @@
 +/*
 + * i2c Support for Atmel's Two-Wire Interface (TWI)
@@ -12688,9 +12526,8 @@ diff -urN linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.c avr32-2.6/drivers/i2c
 +MODULE_AUTHOR("Espen Krangnes");
 +MODULE_DESCRIPTION("I2C driver for Atmel TWI");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Espen Krangnes");
 +MODULE_DESCRIPTION("I2C driver for Atmel TWI");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.h avr32-2.6/drivers/i2c/busses/i2c-atmeltwi.h
---- linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.h   1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/i2c/busses/i2c-atmeltwi.h        2008-04-23 19:33:37.000000000 +0200
+--- /dev/null
++++ b/drivers/i2c/busses/i2c-atmeltwi.h
 @@ -0,0 +1,117 @@
 +/*
 + * Register definitions for the Atmel Two-Wire Interface
 @@ -0,0 +1,117 @@
 +/*
 + * Register definitions for the Atmel Two-Wire Interface
@@ -12809,9 +12646,8 @@ diff -urN linux-2.6.24.3/drivers/i2c/busses/i2c-atmeltwi.h avr32-2.6/drivers/i2c
 +      __raw_writel((value), (port)->regs + TWI_##reg)
 +
 +#endif /* __ATMELTWI_H__ */
 +      __raw_writel((value), (port)->regs + TWI_##reg)
 +
 +#endif /* __ATMELTWI_H__ */
-diff -urN linux-2.6.24.3/drivers/i2c/busses/Kconfig avr32-2.6/drivers/i2c/busses/Kconfig
---- linux-2.6.24.3/drivers/i2c/busses/Kconfig  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/i2c/busses/Kconfig       2008-04-23 20:12:40.000000000 +0200
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
 @@ -88,6 +88,14 @@
          to support combined I2C messages.  Use the i2c-gpio driver
          unless your system can cope with those limitations.
 @@ -88,6 +88,14 @@
          to support combined I2C messages.  Use the i2c-gpio driver
          unless your system can cope with those limitations.
@@ -12827,9 +12663,8 @@ diff -urN linux-2.6.24.3/drivers/i2c/busses/Kconfig avr32-2.6/drivers/i2c/busses
  config I2C_AU1550
        tristate "Au1550/Au1200 SMBus interface"
        depends on SOC_AU1550 || SOC_AU1200
  config I2C_AU1550
        tristate "Au1550/Au1200 SMBus interface"
        depends on SOC_AU1550 || SOC_AU1200
-diff -urN linux-2.6.24.3/drivers/i2c/busses/Makefile avr32-2.6/drivers/i2c/busses/Makefile
---- linux-2.6.24.3/drivers/i2c/busses/Makefile 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/i2c/busses/Makefile      2008-04-23 20:12:40.000000000 +0200
+--- a/drivers/i2c/busses/Makefile
++++ b/drivers/i2c/busses/Makefile
 @@ -53,6 +53,7 @@
  obj-$(CONFIG_I2C_VOODOO3)     += i2c-voodoo3.o
  obj-$(CONFIG_SCx200_ACB)      += scx200_acb.o
 @@ -53,6 +53,7 @@
  obj-$(CONFIG_I2C_VOODOO3)     += i2c-voodoo3.o
  obj-$(CONFIG_SCx200_ACB)      += scx200_acb.o
@@ -12838,9 +12673,8 @@ diff -urN linux-2.6.24.3/drivers/i2c/busses/Makefile avr32-2.6/drivers/i2c/busse
  
  ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
  EXTRA_CFLAGS += -DDEBUG
  
  ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
  EXTRA_CFLAGS += -DDEBUG
-diff -urN linux-2.6.24.3/drivers/input/serio/at32psif.c avr32-2.6/drivers/input/serio/at32psif.c
---- linux-2.6.24.3/drivers/input/serio/at32psif.c      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/input/serio/at32psif.c   2008-04-23 20:12:40.000000000 +0200
+--- /dev/null
++++ b/drivers/input/serio/at32psif.c
 @@ -0,0 +1,351 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
 @@ -0,0 +1,351 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
@@ -13193,9 +13027,8 @@ diff -urN linux-2.6.24.3/drivers/input/serio/at32psif.c avr32-2.6/drivers/input/
 +MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
 +MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
 +MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/drivers/input/serio/at32psif.h avr32-2.6/drivers/input/serio/at32psif.h
---- linux-2.6.24.3/drivers/input/serio/at32psif.h      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/input/serio/at32psif.h   2008-04-23 20:12:40.000000000 +0200
+--- /dev/null
++++ b/drivers/input/serio/at32psif.h
 @@ -0,0 +1,82 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
 @@ -0,0 +1,82 @@
 +/*
 + * Copyright (C) 2007 Atmel Corporation
@@ -13279,9 +13112,8 @@ diff -urN linux-2.6.24.3/drivers/input/serio/at32psif.h avr32-2.6/drivers/input/
 +      __raw_writel((value), (port)->regs + PSIF_##reg)
 +
 +#endif /* _AT32PSIF_H */
 +      __raw_writel((value), (port)->regs + PSIF_##reg)
 +
 +#endif /* _AT32PSIF_H */
-diff -urN linux-2.6.24.3/drivers/input/serio/Kconfig avr32-2.6/drivers/input/serio/Kconfig
---- linux-2.6.24.3/drivers/input/serio/Kconfig 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/input/serio/Kconfig      2008-04-23 20:12:40.000000000 +0200
+--- a/drivers/input/serio/Kconfig
++++ b/drivers/input/serio/Kconfig
 @@ -88,6 +88,17 @@
          To compile this driver as a module, choose M here: the
          module will be called rpckbd.
 @@ -88,6 +88,17 @@
          To compile this driver as a module, choose M here: the
          module will be called rpckbd.
@@ -13300,9 +13132,8 @@ diff -urN linux-2.6.24.3/drivers/input/serio/Kconfig avr32-2.6/drivers/input/ser
  config SERIO_AMBAKMI
        tristate "AMBA KMI keyboard controller"
        depends on ARM_AMBA
  config SERIO_AMBAKMI
        tristate "AMBA KMI keyboard controller"
        depends on ARM_AMBA
-diff -urN linux-2.6.24.3/drivers/input/serio/Makefile avr32-2.6/drivers/input/serio/Makefile
---- linux-2.6.24.3/drivers/input/serio/Makefile        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/input/serio/Makefile     2008-04-23 20:12:40.000000000 +0200
+--- a/drivers/input/serio/Makefile
++++ b/drivers/input/serio/Makefile
 @@ -12,6 +12,7 @@
  obj-$(CONFIG_SERIO_RPCKBD)    += rpckbd.o
  obj-$(CONFIG_SERIO_SA1111)    += sa1111ps2.o
 @@ -12,6 +12,7 @@
  obj-$(CONFIG_SERIO_RPCKBD)    += rpckbd.o
  obj-$(CONFIG_SERIO_SA1111)    += sa1111ps2.o
@@ -13311,9 +13142,8 @@ diff -urN linux-2.6.24.3/drivers/input/serio/Makefile avr32-2.6/drivers/input/se
  obj-$(CONFIG_SERIO_Q40KBD)    += q40kbd.o
  obj-$(CONFIG_SERIO_GSCPS2)    += gscps2.o
  obj-$(CONFIG_HP_SDC)          += hp_sdc.o
  obj-$(CONFIG_SERIO_Q40KBD)    += q40kbd.o
  obj-$(CONFIG_SERIO_GSCPS2)    += gscps2.o
  obj-$(CONFIG_HP_SDC)          += hp_sdc.o
-diff -urN linux-2.6.24.3/drivers/leds/Kconfig avr32-2.6/drivers/leds/Kconfig
---- linux-2.6.24.3/drivers/leds/Kconfig        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/leds/Kconfig     2008-04-23 20:12:41.000000000 +0200
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
 @@ -18,6 +18,13 @@
  
  comment "LED drivers"
 @@ -18,6 +18,13 @@
  
  comment "LED drivers"
@@ -13328,9 +13158,8 @@ diff -urN linux-2.6.24.3/drivers/leds/Kconfig avr32-2.6/drivers/leds/Kconfig
  config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
        depends on LEDS_CLASS && PXA_SHARP_C7xx
  config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
        depends on LEDS_CLASS && PXA_SHARP_C7xx
-diff -urN linux-2.6.24.3/drivers/leds/leds-atmel-pwm.c avr32-2.6/drivers/leds/leds-atmel-pwm.c
---- linux-2.6.24.3/drivers/leds/leds-atmel-pwm.c       1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/leds/leds-atmel-pwm.c    2008-04-23 19:33:39.000000000 +0200
+--- /dev/null
++++ b/drivers/leds/leds-atmel-pwm.c
 @@ -0,0 +1,155 @@
 +#include <linux/kernel.h>
 +#include <linux/platform_device.h>
 @@ -0,0 +1,155 @@
 +#include <linux/kernel.h>
 +#include <linux/platform_device.h>
@@ -13487,9 +13316,8 @@ diff -urN linux-2.6.24.3/drivers/leds/leds-atmel-pwm.c avr32-2.6/drivers/leds/le
 +
 +MODULE_DESCRIPTION("Driver for LEDs with PWM-controlled brightness");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_DESCRIPTION("Driver for LEDs with PWM-controlled brightness");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/drivers/leds/Makefile avr32-2.6/drivers/leds/Makefile
---- linux-2.6.24.3/drivers/leds/Makefile       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/leds/Makefile    2008-04-23 20:12:41.000000000 +0200
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
 @@ -5,6 +5,7 @@
  obj-$(CONFIG_LEDS_TRIGGERS)           += led-triggers.o
  
 @@ -5,6 +5,7 @@
  obj-$(CONFIG_LEDS_TRIGGERS)           += led-triggers.o
  
@@ -13498,9 +13326,8 @@ diff -urN linux-2.6.24.3/drivers/leds/Makefile avr32-2.6/drivers/leds/Makefile
  obj-$(CONFIG_LEDS_CORGI)              += leds-corgi.o
  obj-$(CONFIG_LEDS_LOCOMO)             += leds-locomo.o
  obj-$(CONFIG_LEDS_SPITZ)              += leds-spitz.o
  obj-$(CONFIG_LEDS_CORGI)              += leds-corgi.o
  obj-$(CONFIG_LEDS_LOCOMO)             += leds-locomo.o
  obj-$(CONFIG_LEDS_SPITZ)              += leds-spitz.o
-diff -urN linux-2.6.24.3/drivers/misc/atmel_pwm.c avr32-2.6/drivers/misc/atmel_pwm.c
---- linux-2.6.24.3/drivers/misc/atmel_pwm.c    1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/misc/atmel_pwm.c 2008-04-23 19:33:40.000000000 +0200
+--- /dev/null
++++ b/drivers/misc/atmel_pwm.c
 @@ -0,0 +1,409 @@
 +#include <linux/module.h>
 +#include <linux/clk.h>
 @@ -0,0 +1,409 @@
 +#include <linux/module.h>
 +#include <linux/clk.h>
@@ -13911,9 +13738,8 @@ diff -urN linux-2.6.24.3/drivers/misc/atmel_pwm.c avr32-2.6/drivers/misc/atmel_p
 +
 +MODULE_DESCRIPTION("Driver for AT32/AT91 PWM module");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_DESCRIPTION("Driver for AT32/AT91 PWM module");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/drivers/misc/atmel_tclib.c avr32-2.6/drivers/misc/atmel_tclib.c
---- linux-2.6.24.3/drivers/misc/atmel_tclib.c  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/misc/atmel_tclib.c       2008-04-23 20:12:41.000000000 +0200
+--- /dev/null
++++ b/drivers/misc/atmel_tclib.c
 @@ -0,0 +1,161 @@
 +#include <linux/atmel_tc.h>
 +#include <linux/clk.h>
 @@ -0,0 +1,161 @@
 +#include <linux/atmel_tc.h>
 +#include <linux/clk.h>
@@ -14076,9 +13902,8 @@ diff -urN linux-2.6.24.3/drivers/misc/atmel_tclib.c avr32-2.6/drivers/misc/atmel
 +      return platform_driver_probe(&tc_driver, tc_probe);
 +}
 +arch_initcall(tc_init);
 +      return platform_driver_probe(&tc_driver, tc_probe);
 +}
 +arch_initcall(tc_init);
-diff -urN linux-2.6.24.3/drivers/misc/Kconfig avr32-2.6/drivers/misc/Kconfig
---- linux-2.6.24.3/drivers/misc/Kconfig        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/misc/Kconfig     2008-04-23 20:12:41.000000000 +0200
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
 @@ -13,6 +13,48 @@
  
  if MISC_DEVICES
 @@ -13,6 +13,48 @@
  
  if MISC_DEVICES
@@ -14128,9 +13953,8 @@ diff -urN linux-2.6.24.3/drivers/misc/Kconfig avr32-2.6/drivers/misc/Kconfig
  config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
        depends on X86 && PCI && INPUT && EXPERIMENTAL
  config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
        depends on X86 && PCI && INPUT && EXPERIMENTAL
-diff -urN linux-2.6.24.3/drivers/misc/Makefile avr32-2.6/drivers/misc/Makefile
---- linux-2.6.24.3/drivers/misc/Makefile       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/misc/Makefile    2008-04-23 20:12:41.000000000 +0200
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
 @@ -7,7 +7,9 @@
  obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
  obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 @@ -7,7 +7,9 @@
  obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
  obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
@@ -14141,9 +13965,8 @@ diff -urN linux-2.6.24.3/drivers/misc/Makefile avr32-2.6/drivers/misc/Makefile
  obj-$(CONFIG_LKDTM)           += lkdtm.o
  obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
  obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
  obj-$(CONFIG_LKDTM)           += lkdtm.o
  obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
  obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
-diff -urN linux-2.6.24.3/drivers/mmc/host/atmel-mci.c avr32-2.6/drivers/mmc/host/atmel-mci.c
---- linux-2.6.24.3/drivers/mmc/host/atmel-mci.c        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/mmc/host/atmel-mci.c     2008-04-23 20:12:41.000000000 +0200
+--- /dev/null
++++ b/drivers/mmc/host/atmel-mci.c
 @@ -0,0 +1,1220 @@
 +/*
 + * Atmel MultiMedia Card Interface driver
 @@ -0,0 +1,1220 @@
 +/*
 + * Atmel MultiMedia Card Interface driver
@@ -15365,9 +15188,8 @@ diff -urN linux-2.6.24.3/drivers/mmc/host/atmel-mci.c avr32-2.6/drivers/mmc/host
 +
 +MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/drivers/mmc/host/atmel-mci.h avr32-2.6/drivers/mmc/host/atmel-mci.h
---- linux-2.6.24.3/drivers/mmc/host/atmel-mci.h        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/mmc/host/atmel-mci.h     2008-04-23 19:33:40.000000000 +0200
+--- /dev/null
++++ b/drivers/mmc/host/atmel-mci.h
 @@ -0,0 +1,192 @@
 +/*
 + * Atmel MultiMedia Card Interface driver
 @@ -0,0 +1,192 @@
 +/*
 + * Atmel MultiMedia Card Interface driver
@@ -15561,9 +15383,8 @@ diff -urN linux-2.6.24.3/drivers/mmc/host/atmel-mci.h avr32-2.6/drivers/mmc/host
 +      __raw_writel((value), (port)->regs + MCI_##reg)
 +
 +#endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */
 +      __raw_writel((value), (port)->regs + MCI_##reg)
 +
 +#endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */
-diff -urN linux-2.6.24.3/drivers/mmc/host/Kconfig avr32-2.6/drivers/mmc/host/Kconfig
---- linux-2.6.24.3/drivers/mmc/host/Kconfig    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/mmc/host/Kconfig 2008-04-23 19:33:40.000000000 +0200
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
 @@ -91,6 +91,16 @@
  
          If unsure, say N.
 @@ -91,6 +91,16 @@
  
          If unsure, say N.
@@ -15581,9 +15402,8 @@ diff -urN linux-2.6.24.3/drivers/mmc/host/Kconfig avr32-2.6/drivers/mmc/host/Kco
  config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
        depends on ARCH_IMX
  config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
        depends on ARCH_IMX
-diff -urN linux-2.6.24.3/drivers/mmc/host/Makefile avr32-2.6/drivers/mmc/host/Makefile
---- linux-2.6.24.3/drivers/mmc/host/Makefile   2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/mmc/host/Makefile        2008-04-23 19:33:40.000000000 +0200
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
 @@ -15,6 +15,7 @@
  obj-$(CONFIG_MMC_AU1X)                += au1xmmc.o
  obj-$(CONFIG_MMC_OMAP)                += omap.o
 @@ -15,6 +15,7 @@
  obj-$(CONFIG_MMC_AU1X)                += au1xmmc.o
  obj-$(CONFIG_MMC_OMAP)                += omap.o
@@ -15592,9 +15412,8 @@ diff -urN linux-2.6.24.3/drivers/mmc/host/Makefile avr32-2.6/drivers/mmc/host/Ma
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
  
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
  
-diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0001.c avr32-2.6/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0001.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/mtd/chips/cfi_cmdset_0001.c      2008-04-23 20:12:41.000000000 +0200
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
 @@ -50,6 +50,7 @@
  #define I82802AC      0x00ac
  #define MANUFACTURER_ST         0x0020
 @@ -50,6 +50,7 @@
  #define I82802AC      0x00ac
  #define MANUFACTURER_ST         0x0020
@@ -15659,10 +15478,9 @@ diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0001.c avr32-2.6/drivers/m
  #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
  #endif
  #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
  #endif
-diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c avr32-2.6/drivers/mtd/chips/cfi_cmdset_0002.c
---- linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/mtd/chips/cfi_cmdset_0002.c      2008-04-23 20:12:41.000000000 +0200
-@@ -185,6 +185,10 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -186,6 +186,10 @@
                extp->TopBottom = 2;
        else
                extp->TopBottom = 3;
                extp->TopBottom = 2;
        else
                extp->TopBottom = 3;
@@ -15673,7 +15491,7 @@ diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c avr32-2.6/drivers/m
  }
  
  static void fixup_use_secsi(struct mtd_info *mtd, void *param)
  }
  
  static void fixup_use_secsi(struct mtd_info *mtd, void *param)
-@@ -217,6 +221,7 @@
+@@ -218,6 +222,7 @@
  }
  
  static struct cfi_fixup cfi_fixup_table[] = {
  }
  
  static struct cfi_fixup cfi_fixup_table[] = {
@@ -15681,7 +15499,7 @@ diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c avr32-2.6/drivers/m
  #ifdef AMD_BOOTLOC_BUG
        { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
  #endif
  #ifdef AMD_BOOTLOC_BUG
        { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
  #endif
-@@ -229,7 +234,6 @@
+@@ -230,7 +235,6 @@
  #if !FORCE_WORD_WRITE
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
  #endif
  #if !FORCE_WORD_WRITE
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
  #endif
@@ -15689,9 +15507,8 @@ diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c avr32-2.6/drivers/m
        { 0, 0, NULL, NULL }
  };
  static struct cfi_fixup jedec_fixup_table[] = {
        { 0, 0, NULL, NULL }
  };
  static struct cfi_fixup jedec_fixup_table[] = {
-diff -urN linux-2.6.24.3/drivers/pcmcia/at32_cf.c avr32-2.6/drivers/pcmcia/at32_cf.c
---- linux-2.6.24.3/drivers/pcmcia/at32_cf.c    1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/drivers/pcmcia/at32_cf.c 2008-04-23 19:33:42.000000000 +0200
+--- /dev/null
++++ b/drivers/pcmcia/at32_cf.c
 @@ -0,0 +1,533 @@
 +/*
 + * Driver for AVR32 Static Memory Controller: CompactFlash support
 @@ -0,0 +1,533 @@
 +/*
 + * Driver for AVR32 Static Memory Controller: CompactFlash support
@@ -16226,9 +16043,8 @@ diff -urN linux-2.6.24.3/drivers/pcmcia/at32_cf.c avr32-2.6/drivers/pcmcia/at32_
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Driver for SMC PCMCIA interface");
 +MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Driver for SMC PCMCIA interface");
 +MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
-diff -urN linux-2.6.24.3/drivers/pcmcia/Kconfig avr32-2.6/drivers/pcmcia/Kconfig
---- linux-2.6.24.3/drivers/pcmcia/Kconfig      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/pcmcia/Kconfig   2008-04-23 19:33:42.000000000 +0200
+--- a/drivers/pcmcia/Kconfig
++++ b/drivers/pcmcia/Kconfig
 @@ -276,6 +276,13 @@
          Say Y here to support the CompactFlash controller on the
          PA Semi Electra eval board.
 @@ -276,6 +276,13 @@
          Say Y here to support the CompactFlash controller on the
          PA Semi Electra eval board.
@@ -16243,9 +16059,8 @@ diff -urN linux-2.6.24.3/drivers/pcmcia/Kconfig avr32-2.6/drivers/pcmcia/Kconfig
  config PCCARD_NONSTATIC
        tristate
  
  config PCCARD_NONSTATIC
        tristate
  
-diff -urN linux-2.6.24.3/drivers/pcmcia/Makefile avr32-2.6/drivers/pcmcia/Makefile
---- linux-2.6.24.3/drivers/pcmcia/Makefile     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/pcmcia/Makefile  2008-04-23 19:33:42.000000000 +0200
+--- a/drivers/pcmcia/Makefile
++++ b/drivers/pcmcia/Makefile
 @@ -38,6 +38,7 @@
  obj-$(CONFIG_OMAP_CF)                         += omap_cf.o
  obj-$(CONFIG_AT91_CF)                         += at91_cf.o
 @@ -38,6 +38,7 @@
  obj-$(CONFIG_OMAP_CF)                         += omap_cf.o
  obj-$(CONFIG_AT91_CF)                         += at91_cf.o
@@ -16254,9 +16069,8 @@ diff -urN linux-2.6.24.3/drivers/pcmcia/Makefile avr32-2.6/drivers/pcmcia/Makefi
  
  sa11xx_core-y                                 += soc_common.o sa11xx_base.o
  pxa2xx_core-y                                 += soc_common.o pxa2xx_base.o
  
  sa11xx_core-y                                 += soc_common.o sa11xx_base.o
  pxa2xx_core-y                                 += soc_common.o pxa2xx_base.o
-diff -urN linux-2.6.24.3/drivers/serial/atmel_serial.c avr32-2.6/drivers/serial/atmel_serial.c
---- linux-2.6.24.3/drivers/serial/atmel_serial.c       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/serial/atmel_serial.c    2008-04-23 20:12:44.000000000 +0200
+--- a/drivers/serial/atmel_serial.c
++++ b/drivers/serial/atmel_serial.c
 @@ -7,6 +7,8 @@
   *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
   *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
 @@ -7,6 +7,8 @@
   *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
   *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
@@ -17554,9 +17368,8 @@ diff -urN linux-2.6.24.3/drivers/serial/atmel_serial.c avr32-2.6/drivers/serial/
  
        return ret;
  }
  
        return ret;
  }
-diff -urN linux-2.6.24.3/drivers/serial/atmel_serial.h avr32-2.6/drivers/serial/atmel_serial.h
---- linux-2.6.24.3/drivers/serial/atmel_serial.h       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/serial/atmel_serial.h    1970-01-01 01:00:00.000000000 +0100
+--- a/drivers/serial/atmel_serial.h
++++ /dev/null
 @@ -1,127 +0,0 @@
 -/*
 - * drivers/serial/atmel_serial.h
 @@ -1,127 +0,0 @@
 -/*
 - * drivers/serial/atmel_serial.h
@@ -17685,9 +17498,8 @@ diff -urN linux-2.6.24.3/drivers/serial/atmel_serial.h avr32-2.6/drivers/serial/
 -#define ATMEL_US_IF           0x4c                    /* IrDA Filter Register */
 -
 -#endif
 -#define ATMEL_US_IF           0x4c                    /* IrDA Filter Register */
 -
 -#endif
-diff -urN linux-2.6.24.3/drivers/serial/Kconfig avr32-2.6/drivers/serial/Kconfig
---- linux-2.6.24.3/drivers/serial/Kconfig      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/serial/Kconfig   2008-04-23 20:12:44.000000000 +0200
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
 @@ -380,6 +380,21 @@
          console is the device which receives all kernel messages and
          warnings and which allows logins in single user mode).
 @@ -380,6 +380,21 @@
          console is the device which receives all kernel messages and
          warnings and which allows logins in single user mode).
@@ -17710,9 +17522,8 @@ diff -urN linux-2.6.24.3/drivers/serial/Kconfig avr32-2.6/drivers/serial/Kconfig
  config SERIAL_ATMEL_TTYAT
        bool "Install as device ttyATn instead of ttySn"
        depends on SERIAL_ATMEL=y
  config SERIAL_ATMEL_TTYAT
        bool "Install as device ttyATn instead of ttySn"
        depends on SERIAL_ATMEL=y
-diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi.c
---- linux-2.6.24.3/drivers/spi/atmel_spi.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/spi/atmel_spi.c  2008-04-23 20:12:44.000000000 +0200
+--- a/drivers/spi/atmel_spi.c
++++ b/drivers/spi/atmel_spi.c
 @@ -51,7 +51,9 @@
        u8                      stopping;
        struct list_head        queue;
 @@ -51,7 +51,9 @@
        u8                      stopping;
        struct list_head        queue;
@@ -17724,7 +17535,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
  
        void                    *buffer;
        dma_addr_t              buffer_dma;
  
        void                    *buffer;
        dma_addr_t              buffer_dma;
-@@ -85,6 +87,16 @@
+@@ -113,6 +115,16 @@
        unsigned gpio = (unsigned) spi->controller_data;
        unsigned active = spi->mode & SPI_CS_HIGH;
        u32 mr;
        unsigned gpio = (unsigned) spi->controller_data;
        unsigned active = spi->mode & SPI_CS_HIGH;
        u32 mr;
@@ -17739,9 +17550,9 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
 +                      spi_writel(as, CSR0 + 4 * i, csr ^ SPI_BIT(CPOL));
 +      }
  
 +                      spi_writel(as, CSR0 + 4 * i, csr ^ SPI_BIT(CPOL));
 +      }
  
-       mr = spi_readl(as, MR);
-       mr = SPI_BFINS(PCS, ~(1 << spi->chip_select), mr);
-@@ -121,6 +133,48 @@
+       /* only deactivate *this* device; sometimes transfers to
+        * another device may be active when this routine is called.
+@@ -131,6 +143,48 @@
                gpio_set_value(gpio, !active);
  }
  
                gpio_set_value(gpio, !active);
  }
  
@@ -17790,7 +17601,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
  /*
   * Submit next transfer for DMA.
   * lock is held, spi irq is blocked
  /*
   * Submit next transfer for DMA.
   * lock is held, spi irq is blocked
-@@ -130,53 +184,78 @@
+@@ -140,53 +194,78 @@
  {
        struct atmel_spi        *as = spi_master_get_devdata(master);
        struct spi_transfer     *xfer;
  {
        struct atmel_spi        *as = spi_master_get_devdata(master);
        struct spi_transfer     *xfer;
@@ -17908,7 +17719,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
         * transfer because we need to handle some difficult timing
         * issues otherwise. If we wait for ENDTX in one transfer and
         * then starts waiting for ENDRX in the next, it's difficult
         * transfer because we need to handle some difficult timing
         * issues otherwise. If we wait for ENDTX in one transfer and
         * then starts waiting for ENDRX in the next, it's difficult
-@@ -186,17 +265,7 @@
+@@ -196,17 +275,7 @@
         *
         * It should be doable, though. Just not now...
         */
         *
         * It should be doable, though. Just not now...
         */
@@ -17926,7 +17737,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
        spi_writel(as, PTCR, SPI_BIT(TXTEN) | SPI_BIT(RXTEN));
  }
  
        spi_writel(as, PTCR, SPI_BIT(TXTEN) | SPI_BIT(RXTEN));
  }
  
-@@ -294,6 +363,7 @@
+@@ -304,6 +373,7 @@
        spin_lock(&as->lock);
  
        as->current_transfer = NULL;
        spin_lock(&as->lock);
  
        as->current_transfer = NULL;
@@ -17934,7 +17745,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
  
        /* continue if needed */
        if (list_empty(&as->queue) || as->stopping)
  
        /* continue if needed */
        if (list_empty(&as->queue) || as->stopping)
-@@ -377,7 +447,7 @@
+@@ -387,7 +457,7 @@
  
                spi_writel(as, IDR, pending);
  
  
                spi_writel(as, IDR, pending);
  
@@ -17943,7 +17754,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
                        msg->actual_length += xfer->len;
  
                        if (!msg->is_dma_mapped)
                        msg->actual_length += xfer->len;
  
                        if (!msg->is_dma_mapped)
-@@ -387,7 +457,7 @@
+@@ -397,7 +467,7 @@
                        if (xfer->delay_usecs)
                                udelay(xfer->delay_usecs);
  
                        if (xfer->delay_usecs)
                                udelay(xfer->delay_usecs);
  
@@ -17952,7 +17763,7 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
                                /* report completed message */
                                atmel_spi_msg_done(master, as, msg, 0,
                                                xfer->cs_change);
                                /* report completed message */
                                atmel_spi_msg_done(master, as, msg, 0,
                                                xfer->cs_change);
-@@ -490,9 +560,14 @@
+@@ -500,9 +570,14 @@
        if (!(spi->mode & SPI_CPHA))
                csr |= SPI_BIT(NCPHA);
  
        if (!(spi->mode & SPI_CPHA))
                csr |= SPI_BIT(NCPHA);
  
@@ -17970,9 +17781,8 @@ diff -urN linux-2.6.24.3/drivers/spi/atmel_spi.c avr32-2.6/drivers/spi/atmel_spi
  
        /* chipselect must have been muxed as GPIO (e.g. in board setup) */
        npcs_pin = (unsigned int)spi->controller_data;
  
        /* chipselect must have been muxed as GPIO (e.g. in board setup) */
        npcs_pin = (unsigned int)spi->controller_data;
-diff -urN linux-2.6.24.3/drivers/usb/gadget/atmel_usba_udc.c avr32-2.6/drivers/usb/gadget/atmel_usba_udc.c
---- linux-2.6.24.3/drivers/usb/gadget/atmel_usba_udc.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/usb/gadget/atmel_usba_udc.c      2008-04-23 20:12:45.000000000 +0200
+--- a/drivers/usb/gadget/atmel_usba_udc.c
++++ b/drivers/usb/gadget/atmel_usba_udc.c
 @@ -18,6 +18,7 @@
  #include <linux/platform_device.h>
  #include <linux/usb/ch9.h>
 @@ -18,6 +18,7 @@
  #include <linux/platform_device.h>
  #include <linux/usb/ch9.h>
@@ -18216,9 +18026,8 @@ diff -urN linux-2.6.24.3/drivers/usb/gadget/atmel_usba_udc.c avr32-2.6/drivers/u
                usba_ep_cleanup_debugfs(&usba_ep[i]);
        usba_cleanup_debugfs(udc);
  
                usba_ep_cleanup_debugfs(&usba_ep[i]);
        usba_cleanup_debugfs(udc);
  
-diff -urN linux-2.6.24.3/drivers/video/atmel_lcdfb.c avr32-2.6/drivers/video/atmel_lcdfb.c
---- linux-2.6.24.3/drivers/video/atmel_lcdfb.c 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/video/atmel_lcdfb.c      2008-04-23 20:12:45.000000000 +0200
+--- a/drivers/video/atmel_lcdfb.c
++++ b/drivers/video/atmel_lcdfb.c
 @@ -16,6 +16,7 @@
  #include <linux/fb.h>
  #include <linux/init.h>
 @@ -16,6 +16,7 @@
  #include <linux/fb.h>
  #include <linux/init.h>
@@ -18464,9 +18273,8 @@ diff -urN linux-2.6.24.3/drivers/video/atmel_lcdfb.c avr32-2.6/drivers/video/atm
        .driver         = {
                .name   = "atmel_lcdfb",
                .owner  = THIS_MODULE,
        .driver         = {
                .name   = "atmel_lcdfb",
                .owner  = THIS_MODULE,
-diff -urN linux-2.6.24.3/drivers/video/backlight/Kconfig avr32-2.6/drivers/video/backlight/Kconfig
---- linux-2.6.24.3/drivers/video/backlight/Kconfig     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/video/backlight/Kconfig  2008-04-23 20:12:45.000000000 +0200
+--- a/drivers/video/backlight/Kconfig
++++ b/drivers/video/backlight/Kconfig
 @@ -50,6 +50,19 @@
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 @@ -50,6 +50,19 @@
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
@@ -18487,9 +18295,8 @@ diff -urN linux-2.6.24.3/drivers/video/backlight/Kconfig avr32-2.6/drivers/video
  config BACKLIGHT_CORGI
        tristate "Generic (aka Sharp Corgi) Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE
  config BACKLIGHT_CORGI
        tristate "Generic (aka Sharp Corgi) Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE
-diff -urN linux-2.6.24.3/drivers/video/console/Kconfig avr32-2.6/drivers/video/console/Kconfig
---- linux-2.6.24.3/drivers/video/console/Kconfig       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/video/console/Kconfig    2008-04-23 19:33:46.000000000 +0200
+--- a/drivers/video/console/Kconfig
++++ b/drivers/video/console/Kconfig
 @@ -6,7 +6,7 @@
  
  config VGA_CONSOLE
 @@ -6,7 +6,7 @@
  
  config VGA_CONSOLE
@@ -18499,9 +18306,8 @@ diff -urN linux-2.6.24.3/drivers/video/console/Kconfig avr32-2.6/drivers/video/c
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
-diff -urN linux-2.6.24.3/drivers/watchdog/Kconfig avr32-2.6/drivers/watchdog/Kconfig
---- linux-2.6.24.3/drivers/watchdog/Kconfig    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/drivers/watchdog/Kconfig 2008-04-23 20:12:45.000000000 +0200
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
 @@ -223,7 +223,7 @@
  
  config AT32AP700X_WDT
 @@ -223,7 +223,7 @@
  
  config AT32AP700X_WDT
@@ -18511,142 +18317,8 @@ diff -urN linux-2.6.24.3/drivers/watchdog/Kconfig avr32-2.6/drivers/watchdog/Kco
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91rm9200.h avr32-2.6/include/asm-arm/arch-at91/at91rm9200.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91rm9200.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91rm9200.h   2008-04-23 19:33:48.000000000 +0200
-@@ -93,6 +93,11 @@
- #define AT91_RTC      (0xfffffe00 - AT91_BASE_SYS)    /* Real-Time Clock */
- #define AT91_MC               (0xffffff00 - AT91_BASE_SYS)    /* Memory Controllers */
- 
-+#define AT91_USART0   AT91RM9200_BASE_US0
-+#define AT91_USART1   AT91RM9200_BASE_US1
-+#define AT91_USART2   AT91RM9200_BASE_US2
-+#define AT91_USART3   AT91RM9200_BASE_US3
-+
- #define AT91_MATRIX   0       /* not supported */
- 
- /*
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9260.h avr32-2.6/include/asm-arm/arch-at91/at91sam9260.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9260.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9260.h  2008-04-23 19:33:48.000000000 +0200
-@@ -99,6 +99,13 @@
- #define AT91_WDT      (0xfffffd40 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd50 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9260_BASE_US0
-+#define AT91_USART1   AT91SAM9260_BASE_US1
-+#define AT91_USART2   AT91SAM9260_BASE_US2
-+#define AT91_USART3   AT91SAM9260_BASE_US3
-+#define AT91_USART4   AT91SAM9260_BASE_US4
-+#define AT91_USART5   AT91SAM9260_BASE_US5
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9261.h avr32-2.6/include/asm-arm/arch-at91/at91sam9261.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9261.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9261.h  2008-04-23 19:33:48.000000000 +0200
-@@ -84,6 +84,10 @@
- #define AT91_WDT      (0xfffffd40 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd50 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9261_BASE_US0
-+#define AT91_USART1   AT91SAM9261_BASE_US1
-+#define AT91_USART2   AT91SAM9261_BASE_US2
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9263.h avr32-2.6/include/asm-arm/arch-at91/at91sam9263.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9263.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9263.h  2008-04-23 19:33:48.000000000 +0200
-@@ -101,6 +101,10 @@
- #define AT91_RTT1     (0xfffffd50 - AT91_BASE_SYS)
- #define AT91_GPBR     (0xfffffd60 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9263_BASE_US0
-+#define AT91_USART1   AT91SAM9263_BASE_US1
-+#define AT91_USART2   AT91SAM9263_BASE_US2
-+
- #define AT91_SMC      AT91_SMC0
- 
- /*
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9rl.h avr32-2.6/include/asm-arm/arch-at91/at91sam9rl.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/at91sam9rl.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/at91sam9rl.h   2008-04-23 19:33:48.000000000 +0200
-@@ -94,6 +94,11 @@
- #define AT91_GPBR     (0xfffffd60 - AT91_BASE_SYS)
- #define AT91_RTC      (0xfffffe00 - AT91_BASE_SYS)
- 
-+#define AT91_USART0   AT91SAM9RL_BASE_US0
-+#define AT91_USART1   AT91SAM9RL_BASE_US1
-+#define AT91_USART2   AT91SAM9RL_BASE_US2
-+#define AT91_USART3   AT91SAM9RL_BASE_US3
-+
- 
- /*
-  * Internal Memory.
-diff -urN linux-2.6.24.3/include/asm-arm/arch-at91/uncompress.h avr32-2.6/include/asm-arm/arch-at91/uncompress.h
---- linux-2.6.24.3/include/asm-arm/arch-at91/uncompress.h      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-arm/arch-at91/uncompress.h   2008-04-23 19:33:48.000000000 +0200
-@@ -22,7 +22,23 @@
- #define __ASM_ARCH_UNCOMPRESS_H
- 
- #include <asm/io.h>
--#include <asm/arch/at91_dbgu.h>
-+#include <linux/atmel_serial.h>
-+
-+#if defined(CONFIG_AT91_EARLY_DBGU)
-+#define UART_OFFSET (AT91_DBGU + AT91_BASE_SYS)
-+#elif defined(CONFIG_AT91_EARLY_USART0)
-+#define UART_OFFSET AT91_USART0
-+#elif defined(CONFIG_AT91_EARLY_USART1)
-+#define UART_OFFSET AT91_USART1
-+#elif defined(CONFIG_AT91_EARLY_USART2)
-+#define UART_OFFSET AT91_USART2
-+#elif defined(CONFIG_AT91_EARLY_USART3)
-+#define UART_OFFSET AT91_USART3
-+#elif defined(CONFIG_AT91_EARLY_USART4)
-+#define UART_OFFSET AT91_USART4
-+#elif defined(CONFIG_AT91_EARLY_USART5)
-+#define UART_OFFSET AT91_USART5
-+#endif
- 
- /*
-  * The following code assumes the serial port has already been
-@@ -33,22 +49,22 @@
-  */
- static void putc(int c)
- {
--#ifdef AT91_DBGU
--      void __iomem *sys = (void __iomem *) AT91_BASE_SYS;     /* physical address */
-+#ifdef UART_OFFSET
-+      void __iomem *sys = (void __iomem *) UART_OFFSET;       /* physical address */
- 
--      while (!(__raw_readl(sys + AT91_DBGU_SR) & AT91_DBGU_TXRDY))
-+      while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXRDY))
-               barrier();
--      __raw_writel(c, sys + AT91_DBGU_THR);
-+      __raw_writel(c, sys + ATMEL_US_THR);
- #endif
- }
- 
- static inline void flush(void)
- {
--#ifdef AT91_DBGU
--      void __iomem *sys = (void __iomem *) AT91_BASE_SYS;     /* physical address */
-+#ifdef UART_OFFSET
-+      void __iomem *sys = (void __iomem *) UART_OFFSET;       /* physical address */
- 
-       /* wait for transmission to complete */
--      while (!(__raw_readl(sys + AT91_DBGU_SR) & AT91_DBGU_TXEMPTY))
-+      while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXEMPTY))
-               barrier();
- #endif
- }
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/at32ap7000.h       1970-01-01 01:00:00.000000000 +0100
+--- a/include/asm-avr32/arch-at32ap/at32ap7000.h
++++ /dev/null
 @@ -1,35 +0,0 @@
 -/*
 - * Pin definitions for AT32AP7000.
 @@ -1,35 +0,0 @@
 -/*
 - * Pin definitions for AT32AP7000.
@@ -18683,9 +18355,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap7000.h avr32-2.6/in
 -#define GPIO_PIN_PE(N)        (GPIO_PIOE_BASE + (N))
 -
 -#endif /* __ASM_ARCH_AT32AP7000_H__ */
 -#define GPIO_PIN_PE(N)        (GPIO_PIOE_BASE + (N))
 -
 -#endif /* __ASM_ARCH_AT32AP7000_H__ */
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap700x.h avr32-2.6/include/asm-avr32/arch-at32ap/at32ap700x.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap700x.h  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/at32ap700x.h       2008-04-23 20:12:46.000000000 +0200
+--- /dev/null
++++ b/include/asm-avr32/arch-at32ap/at32ap700x.h
 @@ -0,0 +1,35 @@
 +/*
 + * Pin definitions for AT32AP7000.
 @@ -0,0 +1,35 @@
 +/*
 + * Pin definitions for AT32AP7000.
@@ -18722,9 +18393,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/at32ap700x.h avr32-2.6/in
 +#define GPIO_PIN_PE(N)        (GPIO_PIOE_BASE + (N))
 +
 +#endif /* __ASM_ARCH_AT32AP700X_H__ */
 +#define GPIO_PIN_PE(N)        (GPIO_PIOE_BASE + (N))
 +
 +#endif /* __ASM_ARCH_AT32AP700X_H__ */
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/board.h avr32-2.6/include/asm-avr32/arch-at32ap/board.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/board.h       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/board.h    2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/arch-at32ap/board.h
++++ b/include/asm-avr32/arch-at32ap/board.h
 @@ -38,9 +38,7 @@
  at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
                     unsigned long fbmem_start, unsigned long fbmem_len);
 @@ -38,9 +38,7 @@
  at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
                     unsigned long fbmem_start, unsigned long fbmem_len);
@@ -18774,9 +18444,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/board.h avr32-2.6/include
 +at32_add_device_psif(unsigned int id);
 +
  #endif /* __ASM_ARCH_BOARD_H */
 +at32_add_device_psif(unsigned int id);
 +
  #endif /* __ASM_ARCH_BOARD_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/cpu.h avr32-2.6/include/asm-avr32/arch-at32ap/cpu.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/cpu.h 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/cpu.h      2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/arch-at32ap/cpu.h
++++ b/include/asm-avr32/arch-at32ap/cpu.h
 @@ -14,7 +14,7 @@
   * Only AT32AP7000 is defined for now. We can identify the specific
   * chip at runtime, but I'm not sure if it's really worth it.
 @@ -14,7 +14,7 @@
   * Only AT32AP7000 is defined for now. We can identify the specific
   * chip at runtime, but I'm not sure if it's really worth it.
@@ -18786,9 +18455,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/cpu.h avr32-2.6/include/a
  # define cpu_is_at32ap7000()  (1)
  #else
  # define cpu_is_at32ap7000()  (0)
  # define cpu_is_at32ap7000()  (1)
  #else
  # define cpu_is_at32ap7000()  (0)
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/io.h avr32-2.6/include/asm-avr32/arch-at32ap/io.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/io.h  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/io.h       2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/arch-at32ap/io.h
++++ b/include/asm-avr32/arch-at32ap/io.h
 @@ -4,7 +4,7 @@
  /* For "bizarre" halfword swapping */
  #include <linux/byteorder/swabb.h>
 @@ -4,7 +4,7 @@
  /* For "bizarre" halfword swapping */
  #include <linux/byteorder/swabb.h>
@@ -18807,9 +18475,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/io.h avr32-2.6/include/as
  # define __swizzle_addr_b(addr)       (addr ^ 1UL)
  # define __swizzle_addr_w(addr)       (addr)
  # define __swizzle_addr_l(addr)       (addr)
  # define __swizzle_addr_b(addr)       (addr ^ 1UL)
  # define __swizzle_addr_w(addr)       (addr)
  # define __swizzle_addr_l(addr)       (addr)
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/pm.h avr32-2.6/include/asm-avr32/arch-at32ap/pm.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/pm.h  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/pm.h       2008-04-23 20:12:46.000000000 +0200
+--- /dev/null
++++ b/include/asm-avr32/arch-at32ap/pm.h
 @@ -0,0 +1,48 @@
 +/*
 + * AVR32 AP Power Management.
 @@ -0,0 +1,48 @@
 +/*
 + * AVR32 AP Power Management.
@@ -18859,9 +18526,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/pm.h avr32-2.6/include/as
 +#endif
 +
 +#endif /* __ASM_AVR32_ARCH_PM_H */
 +#endif
 +
 +#endif /* __ASM_AVR32_ARCH_PM_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/portmux.h avr32-2.6/include/asm-avr32/arch-at32ap/portmux.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/portmux.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/portmux.h  2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/arch-at32ap/portmux.h
++++ b/include/asm-avr32/arch-at32ap/portmux.h
 @@ -26,4 +26,16 @@
  void at32_select_gpio(unsigned int pin, unsigned long flags);
  void at32_reserve_pin(unsigned int pin);
 @@ -26,4 +26,16 @@
  void at32_select_gpio(unsigned int pin, unsigned long flags);
  void at32_reserve_pin(unsigned int pin);
@@ -18879,9 +18545,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/portmux.h avr32-2.6/inclu
 +#endif /* CONFIG_GPIO_DEV */
 +
  #endif /* __ASM_ARCH_PORTMUX_H__ */
 +#endif /* CONFIG_GPIO_DEV */
 +
  #endif /* __ASM_ARCH_PORTMUX_H__ */
-diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/time.h avr32-2.6/include/asm-avr32/arch-at32ap/time.h
---- linux-2.6.24.3/include/asm-avr32/arch-at32ap/time.h        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/arch-at32ap/time.h     1970-01-01 01:00:00.000000000 +0100
+--- a/include/asm-avr32/arch-at32ap/time.h
++++ /dev/null
 @@ -1,112 +0,0 @@
 -/*
 - * Copyright (C) 2007 Atmel Corporation
 @@ -1,112 +0,0 @@
 -/*
 - * Copyright (C) 2007 Atmel Corporation
@@ -18995,9 +18660,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/arch-at32ap/time.h avr32-2.6/include/
 -      __raw_writel((value), port + (0x40 * instance) + TIMER_##reg)
 -
 -#endif /* _ASM_AVR32_ARCH_AT32AP_TIME_H */
 -      __raw_writel((value), port + (0x40 * instance) + TIMER_##reg)
 -
 -#endif /* _ASM_AVR32_ARCH_AT32AP_TIME_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/asm.h avr32-2.6/include/asm-avr32/asm.h
---- linux-2.6.24.3/include/asm-avr32/asm.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/asm.h  2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/asm.h
++++ b/include/asm-avr32/asm.h
 @@ -12,10 +12,10 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
 @@ -12,10 +12,10 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -19013,9 +18677,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/asm.h avr32-2.6/include/asm-avr32/asm
  
  #ifdef CONFIG_FRAME_POINTER
        .macro  save_fp
  
  #ifdef CONFIG_FRAME_POINTER
        .macro  save_fp
-diff -urN linux-2.6.24.3/include/asm-avr32/byteorder.h avr32-2.6/include/asm-avr32/byteorder.h
---- linux-2.6.24.3/include/asm-avr32/byteorder.h       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/byteorder.h    2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/byteorder.h
++++ b/include/asm-avr32/byteorder.h
 @@ -12,8 +12,10 @@
  extern unsigned short __builtin_bswap_16(unsigned short x);
  #endif
 @@ -12,8 +12,10 @@
  extern unsigned short __builtin_bswap_16(unsigned short x);
  #endif
@@ -19027,9 +18690,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/byteorder.h avr32-2.6/include/asm-avr
  
  #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
  # define __BYTEORDER_HAS_U64__
  
  #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
  # define __BYTEORDER_HAS_U64__
-diff -urN linux-2.6.24.3/include/asm-avr32/dma-controller.h avr32-2.6/include/asm-avr32/dma-controller.h
---- linux-2.6.24.3/include/asm-avr32/dma-controller.h  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/dma-controller.h       2008-04-23 19:33:48.000000000 +0200
+--- /dev/null
++++ b/include/asm-avr32/dma-controller.h
 @@ -0,0 +1,166 @@
 +/*
 + * Copyright (C) 2005-2006 Atmel Corporation
 @@ -0,0 +1,166 @@
 +/*
 + * Copyright (C) 2005-2006 Atmel Corporation
@@ -19197,9 +18859,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/dma-controller.h avr32-2.6/include/as
 +extern struct dma_controller *find_dma_controller(int id);
 +
 +#endif /* __ASM_AVR32_DMA_CONTROLLER_H */
 +extern struct dma_controller *find_dma_controller(int id);
 +
 +#endif /* __ASM_AVR32_DMA_CONTROLLER_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/intc.h avr32-2.6/include/asm-avr32/intc.h
---- linux-2.6.24.3/include/asm-avr32/intc.h    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/intc.h 1970-01-01 01:00:00.000000000 +0100
+--- a/include/asm-avr32/intc.h
++++ /dev/null
 @@ -1,128 +0,0 @@
 -#ifndef __ASM_AVR32_INTC_H
 -#define __ASM_AVR32_INTC_H
 @@ -1,128 +0,0 @@
 -#ifndef __ASM_AVR32_INTC_H
 -#define __ASM_AVR32_INTC_H
@@ -19329,9 +18990,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/intc.h avr32-2.6/include/asm-avr32/in
 -extern int intc_register_controller(struct irq_controller *ctrl);
 -
 -#endif /* __ASM_AVR32_INTC_H */
 -extern int intc_register_controller(struct irq_controller *ctrl);
 -
 -#endif /* __ASM_AVR32_INTC_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/irq.h avr32-2.6/include/asm-avr32/irq.h
---- linux-2.6.24.3/include/asm-avr32/irq.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/irq.h  2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/irq.h
++++ b/include/asm-avr32/irq.h
 @@ -11,4 +11,14 @@
  
  #define irq_canonicalize(i)   (i)
 @@ -11,4 +11,14 @@
  
  #define irq_canonicalize(i)   (i)
@@ -19347,9 +19007,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/irq.h avr32-2.6/include/asm-avr32/irq
 +#endif
 +
  #endif /* __ASM_AVR32_IOCTLS_H */
 +#endif
 +
  #endif /* __ASM_AVR32_IOCTLS_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/kdebug.h avr32-2.6/include/asm-avr32/kdebug.h
---- linux-2.6.24.3/include/asm-avr32/kdebug.h  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/kdebug.h       2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/kdebug.h
++++ b/include/asm-avr32/kdebug.h
 @@ -5,6 +5,7 @@
  enum die_val {
        DIE_BREAKPOINT,
 @@ -5,6 +5,7 @@
  enum die_val {
        DIE_BREAKPOINT,
@@ -19358,9 +19017,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/kdebug.h avr32-2.6/include/asm-avr32/
  };
  
  #endif /* __ASM_AVR32_KDEBUG_H */
  };
  
  #endif /* __ASM_AVR32_KDEBUG_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/ocd.h avr32-2.6/include/asm-avr32/ocd.h
---- linux-2.6.24.3/include/asm-avr32/ocd.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/ocd.h  2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/ocd.h
++++ b/include/asm-avr32/ocd.h
 @@ -533,6 +533,11 @@
  #define ocd_read(reg)                 __ocd_read(OCD_##reg)
  #define ocd_write(reg, value)         __ocd_write(OCD_##reg, value)
 @@ -533,6 +533,11 @@
  #define ocd_read(reg)                 __ocd_read(OCD_##reg)
  #define ocd_write(reg, value)         __ocd_write(OCD_##reg, value)
@@ -19373,9 +19031,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/ocd.h avr32-2.6/include/asm-avr32/ocd
  #endif /* !__ASSEMBLER__ */
  
  #endif /* __ASM_AVR32_OCD_H */
  #endif /* !__ASSEMBLER__ */
  
  #endif /* __ASM_AVR32_OCD_H */
-diff -urN linux-2.6.24.3/include/asm-avr32/pgtable.h avr32-2.6/include/asm-avr32/pgtable.h
---- linux-2.6.24.3/include/asm-avr32/pgtable.h 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/pgtable.h      2008-04-23 20:12:46.000000000 +0200
+--- a/include/asm-avr32/pgtable.h
++++ b/include/asm-avr32/pgtable.h
 @@ -157,6 +157,7 @@
  #define _PAGE_S(x)    _PAGE_NORMAL(x)
  
 @@ -157,6 +157,7 @@
  #define _PAGE_S(x)    _PAGE_NORMAL(x)
  
@@ -19384,9 +19041,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/pgtable.h avr32-2.6/include/asm-avr32
  
  #ifndef __ASSEMBLY__
  /*
  
  #ifndef __ASSEMBLY__
  /*
-diff -urN linux-2.6.24.3/include/asm-avr32/processor.h avr32-2.6/include/asm-avr32/processor.h
---- linux-2.6.24.3/include/asm-avr32/processor.h       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/processor.h    2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/processor.h
++++ b/include/asm-avr32/processor.h
 @@ -57,11 +57,25 @@
        unsigned short cpu_revision;
        enum tlb_config tlb_config;
 @@ -57,11 +57,25 @@
        unsigned short cpu_revision;
        enum tlb_config tlb_config;
@@ -19413,9 +19069,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/processor.h avr32-2.6/include/asm-avr
  extern struct avr32_cpuinfo boot_cpu_data;
  
  #ifdef CONFIG_SMP
  extern struct avr32_cpuinfo boot_cpu_data;
  
  #ifdef CONFIG_SMP
-diff -urN linux-2.6.24.3/include/asm-avr32/ptrace.h avr32-2.6/include/asm-avr32/ptrace.h
---- linux-2.6.24.3/include/asm-avr32/ptrace.h  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/ptrace.h       2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/ptrace.h
++++ b/include/asm-avr32/ptrace.h
 @@ -121,7 +121,15 @@
  };
  
 @@ -121,7 +121,15 @@
  };
  
@@ -19443,9 +19098,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/ptrace.h avr32-2.6/include/asm-avr32/
  
  #endif /* __KERNEL__ */
  
  
  #endif /* __KERNEL__ */
  
-diff -urN linux-2.6.24.3/include/asm-avr32/thread_info.h avr32-2.6/include/asm-avr32/thread_info.h
---- linux-2.6.24.3/include/asm-avr32/thread_info.h     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/asm-avr32/thread_info.h  2008-04-23 19:33:48.000000000 +0200
+--- a/include/asm-avr32/thread_info.h
++++ b/include/asm-avr32/thread_info.h
 @@ -88,6 +88,7 @@
  #define TIF_MEMDIE            6
  #define TIF_RESTORE_SIGMASK   7       /* restore signal mask in do_signal */
 @@ -88,6 +88,7 @@
  #define TIF_MEMDIE            6
  #define TIF_RESTORE_SIGMASK   7       /* restore signal mask in do_signal */
@@ -19454,9 +19108,8 @@ diff -urN linux-2.6.24.3/include/asm-avr32/thread_info.h avr32-2.6/include/asm-a
  #define TIF_USERSPACE         31      /* true if FS sets userspace */
  
  #define _TIF_SYSCALL_TRACE    (1 << TIF_SYSCALL_TRACE)
  #define TIF_USERSPACE         31      /* true if FS sets userspace */
  
  #define _TIF_SYSCALL_TRACE    (1 << TIF_SYSCALL_TRACE)
-diff -urN linux-2.6.24.3/include/linux/atmel_pwm.h avr32-2.6/include/linux/atmel_pwm.h
---- linux-2.6.24.3/include/linux/atmel_pwm.h   1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/linux/atmel_pwm.h        2008-04-23 19:33:51.000000000 +0200
+--- /dev/null
++++ b/include/linux/atmel_pwm.h
 @@ -0,0 +1,70 @@
 +#ifndef __LINUX_ATMEL_PWM_H
 +#define __LINUX_ATMEL_PWM_H
 @@ -0,0 +1,70 @@
 +#ifndef __LINUX_ATMEL_PWM_H
 +#define __LINUX_ATMEL_PWM_H
@@ -19528,9 +19181,8 @@ diff -urN linux-2.6.24.3/include/linux/atmel_pwm.h avr32-2.6/include/linux/atmel
 +}
 +
 +#endif /* __LINUX_ATMEL_PWM_H */
 +}
 +
 +#endif /* __LINUX_ATMEL_PWM_H */
-diff -urN linux-2.6.24.3/include/linux/atmel_serial.h avr32-2.6/include/linux/atmel_serial.h
---- linux-2.6.24.3/include/linux/atmel_serial.h        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/linux/atmel_serial.h     2008-04-23 19:33:51.000000000 +0200
+--- /dev/null
++++ b/include/linux/atmel_serial.h
 @@ -0,0 +1,127 @@
 +/*
 + * include/linux/atmel_serial.h
 @@ -0,0 +1,127 @@
 +/*
 + * include/linux/atmel_serial.h
@@ -19659,9 +19311,8 @@ diff -urN linux-2.6.24.3/include/linux/atmel_serial.h avr32-2.6/include/linux/at
 +#define ATMEL_US_IF           0x4c                    /* IrDA Filter Register */
 +
 +#endif
 +#define ATMEL_US_IF           0x4c                    /* IrDA Filter Register */
 +
 +#endif
-diff -urN linux-2.6.24.3/include/linux/atmel_tc.h avr32-2.6/include/linux/atmel_tc.h
---- linux-2.6.24.3/include/linux/atmel_tc.h    1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/linux/atmel_tc.h 2008-04-23 20:12:46.000000000 +0200
+--- /dev/null
++++ b/include/linux/atmel_tc.h
 @@ -0,0 +1,252 @@
 +/*
 + * Timer/Counter Unit (TC) registers.
 @@ -0,0 +1,252 @@
 +/*
 + * Timer/Counter Unit (TC) registers.
@@ -19915,9 +19566,8 @@ diff -urN linux-2.6.24.3/include/linux/atmel_tc.h avr32-2.6/include/linux/atmel_
 +#define     ATMEL_TC_ETRGS    (1 <<  7)       /* external trigger */
 +
 +#endif
 +#define     ATMEL_TC_ETRGS    (1 <<  7)       /* external trigger */
 +
 +#endif
-diff -urN linux-2.6.24.3/include/linux/usb/atmel_usba_udc.h avr32-2.6/include/linux/usb/atmel_usba_udc.h
---- linux-2.6.24.3/include/linux/usb/atmel_usba_udc.h  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/include/linux/usb/atmel_usba_udc.h       2008-04-23 20:12:47.000000000 +0200
+--- /dev/null
++++ b/include/linux/usb/atmel_usba_udc.h
 @@ -0,0 +1,22 @@
 +/*
 + * Platform data definitions for Atmel USBA gadget driver.
 @@ -0,0 +1,22 @@
 +/*
 + * Platform data definitions for Atmel USBA gadget driver.
@@ -19941,9 +19591,8 @@ diff -urN linux-2.6.24.3/include/linux/usb/atmel_usba_udc.h avr32-2.6/include/li
 +};
 +
 +#endif /* __LINUX_USB_USBA_H */
 +};
 +
 +#endif /* __LINUX_USB_USBA_H */
-diff -urN linux-2.6.24.3/include/video/atmel_lcdc.h avr32-2.6/include/video/atmel_lcdc.h
---- linux-2.6.24.3/include/video/atmel_lcdc.h  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/include/video/atmel_lcdc.h       2008-04-23 19:33:52.000000000 +0200
+--- a/include/video/atmel_lcdc.h
++++ b/include/video/atmel_lcdc.h
 @@ -22,7 +22,7 @@
  #ifndef __ATMEL_LCDC_H__
  #define __ATMEL_LCDC_H__
 @@ -22,7 +22,7 @@
  #ifndef __ATMEL_LCDC_H__
  #define __ATMEL_LCDC_H__
@@ -19997,9 +19646,8 @@ diff -urN linux-2.6.24.3/include/video/atmel_lcdc.h avr32-2.6/include/video/atme
  
  #define ATMEL_LCDC_LCDFRMCFG  0x0810
  #define       ATMEL_LCDC_LINEVAL      (0x7ff <<  0)
  
  #define ATMEL_LCDC_LCDFRMCFG  0x0810
  #define       ATMEL_LCDC_LINEVAL      (0x7ff <<  0)
-diff -urN linux-2.6.24.3/init/do_mounts.c avr32-2.6/init/do_mounts.c
---- linux-2.6.24.3/init/do_mounts.c    2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/init/do_mounts.c 2008-04-23 20:12:47.000000000 +0200
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
 @@ -219,8 +219,14 @@
  
  static int __init rootwait_setup(char *str)
 @@ -219,8 +219,14 @@
  
  static int __init rootwait_setup(char *str)
@@ -20016,9 +19664,8 @@ diff -urN linux-2.6.24.3/init/do_mounts.c avr32-2.6/init/do_mounts.c
        root_wait = 1;
        return 1;
  }
        root_wait = 1;
        return 1;
  }
-diff -urN linux-2.6.24.3/kernel/ptrace.c avr32-2.6/kernel/ptrace.c
---- linux-2.6.24.3/kernel/ptrace.c     2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/kernel/ptrace.c  2008-04-23 20:12:47.000000000 +0200
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
 @@ -470,6 +470,8 @@
        lock_kernel();
        if (request == PTRACE_TRACEME) {
 @@ -470,6 +470,8 @@
        lock_kernel();
        if (request == PTRACE_TRACEME) {
@@ -20028,14 +19675,8 @@ diff -urN linux-2.6.24.3/kernel/ptrace.c avr32-2.6/kernel/ptrace.c
                goto out;
        }
  
                goto out;
        }
  
-diff -urN linux-2.6.24.3/localversion-atmel avr32-2.6/localversion-atmel
---- linux-2.6.24.3/localversion-atmel  1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/localversion-atmel       2008-04-23 20:12:47.000000000 +0200
-@@ -0,0 +1 @@
-+.atmel.3
-diff -urN linux-2.6.24.3/MAINTAINERS avr32-2.6/MAINTAINERS
---- linux-2.6.24.3/MAINTAINERS 2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/MAINTAINERS      2008-04-23 20:12:35.000000000 +0200
+--- a/MAINTAINERS
++++ b/MAINTAINERS
 @@ -671,6 +671,12 @@
  W:    http://www.at91.com/
  S:    Maintained
 @@ -671,6 +671,12 @@
  W:    http://www.at91.com/
  S:    Maintained
@@ -20049,9 +19690,8 @@ diff -urN linux-2.6.24.3/MAINTAINERS avr32-2.6/MAINTAINERS
  ATMEL LCDFB DRIVER
  P:    Nicolas Ferre
  M:    nicolas.ferre@atmel.com
  ATMEL LCDFB DRIVER
  P:    Nicolas Ferre
  M:    nicolas.ferre@atmel.com
-diff -urN linux-2.6.24.3/sound/avr32/ac97c.c avr32-2.6/sound/avr32/ac97c.c
---- linux-2.6.24.3/sound/avr32/ac97c.c 1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/avr32/ac97c.c      2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/avr32/ac97c.c
 @@ -0,0 +1,914 @@
 +/*
 + * Driver for the Atmel AC97 controller
 @@ -0,0 +1,914 @@
 +/*
 + * Driver for the Atmel AC97 controller
@@ -20967,9 +20607,8 @@ diff -urN linux-2.6.24.3/sound/avr32/ac97c.c avr32-2.6/sound/avr32/ac97c.c
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Driver for Atmel AC97 Controller");
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Driver for Atmel AC97 Controller");
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
-diff -urN linux-2.6.24.3/sound/avr32/ac97c.h avr32-2.6/sound/avr32/ac97c.h
---- linux-2.6.24.3/sound/avr32/ac97c.h 1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/avr32/ac97c.h      2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/avr32/ac97c.h
 @@ -0,0 +1,71 @@
 +/*
 + * Register definitions for the Atmel AC97 Controller.
 @@ -0,0 +1,71 @@
 +/*
 + * Register definitions for the Atmel AC97 Controller.
@@ -21042,9 +20681,8 @@ diff -urN linux-2.6.24.3/sound/avr32/ac97c.h avr32-2.6/sound/avr32/ac97c.h
 +#define AC97C_CHANNEL_B               0x2
 +
 +#endif /* __SOUND_AVR32_AC97C_H */
 +#define AC97C_CHANNEL_B               0x2
 +
 +#endif /* __SOUND_AVR32_AC97C_H */
-diff -urN linux-2.6.24.3/sound/avr32/Kconfig avr32-2.6/sound/avr32/Kconfig
---- linux-2.6.24.3/sound/avr32/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/avr32/Kconfig      2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/avr32/Kconfig
 @@ -0,0 +1,11 @@
 +menu "AVR32 devices"
 +      depends on SND != n && AVR32
 @@ -0,0 +1,11 @@
 +menu "AVR32 devices"
 +      depends on SND != n && AVR32
@@ -21057,16 +20695,14 @@ diff -urN linux-2.6.24.3/sound/avr32/Kconfig avr32-2.6/sound/avr32/Kconfig
 +        ALSA sound driver for the Atmel AC97 controller.
 +
 +endmenu
 +        ALSA sound driver for the Atmel AC97 controller.
 +
 +endmenu
-diff -urN linux-2.6.24.3/sound/avr32/Makefile avr32-2.6/sound/avr32/Makefile
---- linux-2.6.24.3/sound/avr32/Makefile        1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/avr32/Makefile     2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/avr32/Makefile
 @@ -0,0 +1,3 @@
 +snd-atmel-ac97-objs           := ac97c.o
 +
 +obj-$(CONFIG_SND_ATMEL_AC97)  += snd-atmel-ac97.o
 @@ -0,0 +1,3 @@
 +snd-atmel-ac97-objs           := ac97c.o
 +
 +obj-$(CONFIG_SND_ATMEL_AC97)  += snd-atmel-ac97.o
-diff -urN linux-2.6.24.3/sound/Kconfig avr32-2.6/sound/Kconfig
---- linux-2.6.24.3/sound/Kconfig       2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/sound/Kconfig    2008-04-23 19:33:54.000000000 +0200
+--- a/sound/Kconfig
++++ b/sound/Kconfig
 @@ -63,6 +63,8 @@
  
  source "sound/arm/Kconfig"
 @@ -63,6 +63,8 @@
  
  source "sound/arm/Kconfig"
@@ -21076,9 +20712,8 @@ diff -urN linux-2.6.24.3/sound/Kconfig avr32-2.6/sound/Kconfig
  if SPI
  source "sound/spi/Kconfig"
  endif
  if SPI
  source "sound/spi/Kconfig"
  endif
-diff -urN linux-2.6.24.3/sound/Makefile avr32-2.6/sound/Makefile
---- linux-2.6.24.3/sound/Makefile      2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/sound/Makefile   2008-04-23 19:33:54.000000000 +0200
+--- a/sound/Makefile
++++ b/sound/Makefile
 @@ -6,7 +6,7 @@
  obj-$(CONFIG_SOUND_PRIME) += oss/
  obj-$(CONFIG_DMASOUND) += oss/
 @@ -6,7 +6,7 @@
  obj-$(CONFIG_SOUND_PRIME) += oss/
  obj-$(CONFIG_DMASOUND) += oss/
@@ -21088,9 +20723,8 @@ diff -urN linux-2.6.24.3/sound/Makefile avr32-2.6/sound/Makefile
  obj-$(CONFIG_SND_AOA) += aoa/
  
  # This one must be compilable even if sound is configured out
  obj-$(CONFIG_SND_AOA) += aoa/
  
  # This one must be compilable even if sound is configured out
-diff -urN linux-2.6.24.3/sound/oss/at32_abdac.c avr32-2.6/sound/oss/at32_abdac.c
---- linux-2.6.24.3/sound/oss/at32_abdac.c      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/oss/at32_abdac.c   2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/oss/at32_abdac.c
 @@ -0,0 +1,722 @@
 +/*
 + * OSS Sound Driver for the Atmel AT32 on-chip DAC.
 @@ -0,0 +1,722 @@
 +/*
 + * OSS Sound Driver for the Atmel AT32 on-chip DAC.
@@ -21814,9 +21448,8 @@ diff -urN linux-2.6.24.3/sound/oss/at32_abdac.c avr32-2.6/sound/oss/at32_abdac.c
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 +MODULE_DESCRIPTION("Sound Driver for the Atmel AT32 ABDAC");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 +MODULE_DESCRIPTION("Sound Driver for the Atmel AT32 ABDAC");
 +MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.3/sound/oss/at32_abdac.h avr32-2.6/sound/oss/at32_abdac.h
---- linux-2.6.24.3/sound/oss/at32_abdac.h      1970-01-01 01:00:00.000000000 +0100
-+++ avr32-2.6/sound/oss/at32_abdac.h   2008-04-23 19:33:54.000000000 +0200
+--- /dev/null
++++ b/sound/oss/at32_abdac.h
 @@ -0,0 +1,59 @@
 +/*
 + * Register definitions for the Atmel AT32 on-chip DAC.
 @@ -0,0 +1,59 @@
 +/*
 + * Register definitions for the Atmel AT32 on-chip DAC.
@@ -21877,9 +21510,8 @@ diff -urN linux-2.6.24.3/sound/oss/at32_abdac.h avr32-2.6/sound/oss/at32_abdac.h
 +      __raw_writel((value), (port)->regs + DAC_##reg)
 +
 +#endif /* __SOUND_OSS_AT32_ABDAC_H__ */
 +      __raw_writel((value), (port)->regs + DAC_##reg)
 +
 +#endif /* __SOUND_OSS_AT32_ABDAC_H__ */
-diff -urN linux-2.6.24.3/sound/oss/Kconfig avr32-2.6/sound/oss/Kconfig
---- linux-2.6.24.3/sound/oss/Kconfig   2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/sound/oss/Kconfig        2008-04-23 19:33:54.000000000 +0200
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
 @@ -654,3 +654,7 @@
        int "DAC channel"
        default "1"
 @@ -654,3 +654,7 @@
        int "DAC channel"
        default "1"
@@ -21888,9 +21520,8 @@ diff -urN linux-2.6.24.3/sound/oss/Kconfig avr32-2.6/sound/oss/Kconfig
 +config SOUND_AT32_ABDAC
 +      tristate "Atmel AT32 Audio Bitstream DAC (ABDAC) support"
 +      depends on SOUND_PRIME && AVR32
 +config SOUND_AT32_ABDAC
 +      tristate "Atmel AT32 Audio Bitstream DAC (ABDAC) support"
 +      depends on SOUND_PRIME && AVR32
-diff -urN linux-2.6.24.3/sound/oss/Makefile avr32-2.6/sound/oss/Makefile
---- linux-2.6.24.3/sound/oss/Makefile  2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/sound/oss/Makefile       2008-04-23 20:12:49.000000000 +0200
+--- a/sound/oss/Makefile
++++ b/sound/oss/Makefile
 @@ -10,6 +10,7 @@
  
  # Please leave it as is, cause the link order is significant !
 @@ -10,6 +10,7 @@
  
  # Please leave it as is, cause the link order is significant !
@@ -21899,9 +21530,8 @@ diff -urN linux-2.6.24.3/sound/oss/Makefile avr32-2.6/sound/oss/Makefile
  obj-$(CONFIG_SOUND_SH_DAC_AUDIO)      += sh_dac_audio.o
  obj-$(CONFIG_SOUND_HAL2)      += hal2.o
  obj-$(CONFIG_SOUND_AEDSP16)   += aedsp16.o
  obj-$(CONFIG_SOUND_SH_DAC_AUDIO)      += sh_dac_audio.o
  obj-$(CONFIG_SOUND_HAL2)      += hal2.o
  obj-$(CONFIG_SOUND_AEDSP16)   += aedsp16.o
-diff -urN linux-2.6.24.3/sound/spi/at73c213.c avr32-2.6/sound/spi/at73c213.c
---- linux-2.6.24.3/sound/spi/at73c213.c        2008-02-26 01:20:20.000000000 +0100
-+++ avr32-2.6/sound/spi/at73c213.c     2008-04-23 20:12:51.000000000 +0200
+--- a/sound/spi/at73c213.c
++++ b/sound/spi/at73c213.c
 @@ -744,7 +744,7 @@
  /*
   * Device functions
 @@ -744,7 +744,7 @@
  /*
   * Device functions
Personal OpenWRT clone
This page took 0.102216 seconds and 4 git commands to generate.