Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

diff --combined arch/arm/mach-s3c2410/mach-bast.c
index 5c289c3a437886f7434628fac9962ae35d83a323,fb1e78e28e50b1d30a62037cb57e23fa2c03deb9..24c6334fac89f05118f2c7969a84921b0abb3c50
--- 1/arch/arm/mach-s3c2410/mach-bast.c
--- 2/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@@ -29,24 -29,24 +29,24 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
- #include <asm/arch/bast-map.h>
- #include <asm/arch/bast-irq.h>
- #include <asm/arch/bast-cpld.h>
+ #include <mach/bast-map.h>
+ #include <mach/bast-irq.h>
+ #include <mach/bast-cpld.h>
  
- #include <asm/hardware.h>
+ #include <mach/hardware.h>
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/mach-types.h>
  
  //#include <asm/debug-ll.h>
  #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-mem.h>
- #include <asm/arch/regs-lcd.h>
+ #include <mach/regs-gpio.h>
+ #include <mach/regs-mem.h>
+ #include <mach/regs-lcd.h>
  
  #include <asm/plat-s3c/nand.h>
  #include <asm/plat-s3c/iic.h>
- #include <asm/arch/fb.h>
+ #include <mach/fb.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/nand.h>
@@@ -562,7 -562,7 +562,7 @@@ static struct platform_device *bast_dev
        &bast_sio,
  };
  
 -static struct clk *bast_clocks[] = {
 +static struct clk *bast_clocks[] __initdata = {
        &s3c24xx_dclk0,
        &s3c24xx_dclk1,
        &s3c24xx_clkout0,

diff --combined arch/arm/mach-s3c2410/mach-vr1000.c
index 7be0bb629bfa2ddc49b59c9c7e860696ce0a8dc8,12cbca68f57d94e71f64eb1acb7e1806e23213c7..fbc0213d5485eb8cc9ce32f328a9647d639f82ec
--- 1/arch/arm/mach-s3c2410/mach-vr1000.c
--- 2/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@@ -30,19 -30,19 +30,19 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
- #include <asm/arch/bast-map.h>
- #include <asm/arch/vr1000-map.h>
- #include <asm/arch/vr1000-irq.h>
- #include <asm/arch/vr1000-cpld.h>
+ #include <mach/bast-map.h>
+ #include <mach/vr1000-map.h>
+ #include <mach/vr1000-irq.h>
+ #include <mach/vr1000-cpld.h>
  
- #include <asm/hardware.h>
+ #include <mach/hardware.h>
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/mach-types.h>
  
  #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/leds-gpio.h>
+ #include <mach/regs-gpio.h>
+ #include <mach/leds-gpio.h>
  
  #include <asm/plat-s3c24xx/clock.h>
  #include <asm/plat-s3c24xx/devs.h>
@@@ -344,7 -344,7 +344,7 @@@ static struct platform_device *vr1000_d
        &vr1000_led3,
  };
  
 -static struct clk *vr1000_clocks[] = {
 +static struct clk *vr1000_clocks[] __initdata = {
        &s3c24xx_dclk0,
        &s3c24xx_dclk1,
        &s3c24xx_clkout0,

diff --combined arch/arm/mach-s3c2440/mach-anubis.c
index 0c33a932d65c5a4ff3f5fdef509cac666cfdd014,265c77dec9d7577ad8af5113ee898b40edc81a71..441f4bc094729a8a04d82cdf699a74007dec7163
--- 1/arch/arm/mach-s3c2440/mach-anubis.c
--- 2/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@@ -27,19 -27,19 +27,19 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
- #include <asm/arch/anubis-map.h>
- #include <asm/arch/anubis-irq.h>
- #include <asm/arch/anubis-cpld.h>
+ #include <mach/anubis-map.h>
+ #include <mach/anubis-irq.h>
+ #include <mach/anubis-cpld.h>
  
- #include <asm/hardware.h>
+ #include <mach/hardware.h>
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/mach-types.h>
  
  #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-mem.h>
- #include <asm/arch/regs-lcd.h>
+ #include <mach/regs-gpio.h>
+ #include <mach/regs-mem.h>
+ #include <mach/regs-lcd.h>
  #include <asm/plat-s3c/nand.h>
  
  #include <linux/mtd/mtd.h>
@@@ -414,7 -414,7 +414,7 @@@ static struct platform_device *anubis_d
        &anubis_device_sm501,
  };
  
 -static struct clk *anubis_clocks[] = {
 +static struct clk *anubis_clocks[] __initdata = {
        &s3c24xx_dclk0,
        &s3c24xx_dclk1,
        &s3c24xx_clkout0,

diff --combined arch/arm/mach-s3c2440/mach-osiris.c
index 3869ca2c345e166eebeeefc8aa35cf59250eca18,d2ee0cd148c66f3a31c3cd02f9173118530a3bb6..8b83f93b6102ae7aa0cbe7b703a4096cd4ee3284
--- 1/arch/arm/mach-s3c2440/mach-osiris.c
--- 2/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@@ -25,18 -25,18 +25,18 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
- #include <asm/arch/osiris-map.h>
- #include <asm/arch/osiris-cpld.h>
+ #include <mach/osiris-map.h>
+ #include <mach/osiris-cpld.h>
  
- #include <asm/hardware.h>
+ #include <mach/hardware.h>
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/mach-types.h>
  
  #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-mem.h>
- #include <asm/arch/regs-lcd.h>
+ #include <mach/regs-gpio.h>
+ #include <mach/regs-mem.h>
+ #include <mach/regs-lcd.h>
  #include <asm/plat-s3c/nand.h>
  
  #include <linux/mtd/mtd.h>
@@@ -341,7 -341,7 +341,7 @@@ static struct platform_device *osiris_d
        &osiris_pcmcia,
  };
  
 -static struct clk *osiris_clocks[] = {
 +static struct clk *osiris_clocks[] __initdata = {
        &s3c24xx_dclk0,
        &s3c24xx_dclk1,
        &s3c24xx_clkout0,

diff --combined drivers/serial/Kconfig
index 09f6346d38a8127b6a05d58c4c2b9c3fc23d1b77,3b4a14e355c1ac386a39c96ce0993d39ccf9e6b6..77cb34270fc18699ad754c4d848bf27cc7e27942
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -1,8 -1,6 +1,6 @@@
  #
  # Serial device configuration
  #
- # $Id: Kconfig,v 1.11 2004/03/11 18:08:04 lethal Exp $
- #
  
  menu "Serial drivers"
        depends on HAS_IOMEM
@@@ -451,7 -449,6 +449,7 @@@ config SERIAL_CLPS711X_CONSOL
  config SERIAL_SAMSUNG
        tristate "Samsung SoC serial support"
        depends on ARM && PLAT_S3C24XX
 +      select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
@@@ -945,22 -942,6 +943,6 @@@ config SERIAL_IP22_ZILOG_CONSOL
        depends on SERIAL_IP22_ZILOG=y
        select SERIAL_CORE_CONSOLE
  
- config V850E_UART
-       bool "NEC V850E on-chip UART support"
-       depends on V850E_MA1 || V850E_ME2 || V850E_TEG || V850E2_ANNA || V850E_AS85EP1
-       select SERIAL_CORE
-       default y
- 
- config V850E_UARTB
-         bool
-       depends on V850E_UART && V850E_ME2
-       default y
- 
- config V850E_UART_CONSOLE
-       bool "Use NEC V850E on-chip UART for console"
-       depends on V850E_UART
-       select SERIAL_CORE_CONSOLE
- 
  config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
        depends on SUPERH || H8300