Merge master.kernel.org:/home/rmk/linux-2.6-arm

diff --combined arch/arm/common/rtctime.c
index ffb82d5bedefaff24f5deb53e6215b16f333e65a,00f6278f42b86c58d207997309f4ab5697a8b9b9..48b1e19b131f938faeed9b53bc4bb9e19d1438bc
--- 1/arch/arm/common/rtctime.c
--- 2/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@@ -17,8 -17,8 +17,9 @@@
  #include <linux/proc_fs.h>
  #include <linux/miscdevice.h>
  #include <linux/spinlock.h>
 +#include <linux/capability.h>
  #include <linux/device.h>
+ #include <linux/mutex.h>
  
  #include <asm/rtc.h>
  #include <asm/semaphore.h>
@@@ -35,7 -35,7 +36,7 @@@ static unsigned long rtc_irq_data
  /*
   * rtc_sem protects rtc_inuse and rtc_ops
   */
- static DECLARE_MUTEX(rtc_sem);
+ static DEFINE_MUTEX(rtc_mutex);
  static unsigned long rtc_inuse;
  static struct rtc_ops *rtc_ops;
  
@@@ -356,7 -356,7 +357,7 @@@ static int rtc_open(struct inode *inode
  {
        int ret;
  
-       down(&rtc_sem);
+       mutex_lock(&rtc_mutex);
  
        if (rtc_inuse) {
                ret = -EBUSY;
@@@ -374,7 -374,7 +375,7 @@@
                        rtc_inuse = 1;
                }
        }
-       up(&rtc_sem);
+       mutex_unlock(&rtc_mutex);
  
        return ret;
  }
@@@ -480,7 -480,7 +481,7 @@@ int register_rtc(struct rtc_ops *ops
  {
        int ret = -EBUSY;
  
-       down(&rtc_sem);
+       mutex_lock(&rtc_mutex);
        if (rtc_ops == NULL) {
                rtc_ops = ops;
  
@@@ -489,7 -489,7 +490,7 @@@
                        create_proc_read_entry("driver/rtc", 0, NULL,
                                               rtc_read_proc, ops);
        }
-       up(&rtc_sem);
+       mutex_unlock(&rtc_mutex);
  
        return ret;
  }
@@@ -497,12 -497,12 +498,12 @@@ EXPORT_SYMBOL(register_rtc)
  
  void unregister_rtc(struct rtc_ops *rtc)
  {
-       down(&rtc_sem);
+       mutex_lock(&rtc_mutex);
        if (rtc == rtc_ops) {
                remove_proc_entry("driver/rtc", NULL);
                misc_deregister(&rtc_miscdev);
                rtc_ops = NULL;
        }
-       up(&rtc_sem);
+       mutex_unlock(&rtc_mutex);
  }
  EXPORT_SYMBOL(unregister_rtc);

diff --combined drivers/serial/Kconfig
index 698cb76819d95d1a3851f6fc70613de38421931d,a256a020b15eb4afcc824f459e7d1041810ab943..843717275d497d7445f26f75f4aa1b0a68ebf40d
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -280,6 -280,40 +280,40 @@@ config SERIAL_AMBA_PL011_CONSOL
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
  
+ config SERIAL_AT91
+       bool "AT91RM9200 serial port support"
+       depends on ARM && ARCH_AT91RM9200
+       select SERIAL_CORE
+       help
+         This enables the driver for the on-chip UARTs of the AT91RM9200
+         processor.
+ 
+ config SERIAL_AT91_CONSOLE
+       bool "Support for console on AT91RM9200 serial port"
+       depends on SERIAL_AT91=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use a UART on the AT91RM9200 as the system
+         console (the system console is the device which receives all kernel
+         messages and warnings and which allows logins in single user mode).
+ 
+ config SERIAL_AT91_TTYAT
+       bool "Install as device ttyAT0-4 instead of ttyS0-4"
+       depends on SERIAL_AT91=y
+       help
+         Say Y here if you wish to have the five internal AT91RM9200 UARTs
+         appear as /dev/ttyAT0-4 (major 240, minor 0-4) instead of the
+         normal /dev/ttyS0-4 (major 4, minor 64-68). This is necessary if
+         you also want other UARTs, such as external 8250/16C550 compatible
+         UARTs.
+         The ttySn nodes are legally reserved for the 8250 serial driver
+         but are often misused by other serial drivers.
+ 
+         To use this, you should create suitable ttyATn device nodes in
+         /dev/, and pass "console=ttyATn" to the kernel.
+ 
+         Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
+ 
  config SERIAL_CLPS711X
        tristate "CLPS711X serial port support"
        depends on ARM && ARCH_CLPS711X
@@@ -860,7 -894,7 +894,7 @@@ config SERIAL_VR41XX_CONSOL
  
  config SERIAL_JSM
          tristate "Digi International NEO PCI Support"
 -      depends on PCI
 +      depends on PCI && BROKEN
          select SERIAL_CORE
          help
            This is a driver for Digi International's Neo series