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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
  [ARM] 3434/1: pxa i2s amsl define
  [ARM] 3425/1: xsc3: need to include pgtable-hwdef.h
  [ARM] Allow un-muxed syscalls to be available for everyone
  [ARM] 3420/1: Missing clobber in example code
  [ARM] nommu: fixups for the exception vectors
  [ARM] nommu: add nommu specific Kconfig and MMUEXT variable in Makefile
  [ARM] nommu: start-up code
  [ARM] nommu: MPU support in boot/compressed/head.S

diff --combined arch/arm/Kconfig
index e91db54,1077c67..dc5a933
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -8,7 -8,6 +8,7 @@@ mainmenu "Linux Kernel Configuration
  config ARM
        bool
        default y
 +      select RTC_LIB
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
@@@ -54,10 -53,6 +54,10 @@@ config RWSEM_GENERIC_SPINLOC
  config RWSEM_XCHGADD_ALGORITHM
        bool
  
 +config GENERIC_HWEIGHT
 +      bool
 +      default y
 +
  config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@@ -77,6 -72,14 +77,14 @@@ config FI
  config ARCH_MTD_XIP
        bool
  
+ config VECTORS_BASE
+       hex
+       default 0xffff0000 if MMU
+       default DRAM_BASE if REMAP_VECTORS_TO_RAM
+       default 0x00000000
+       help
+         The base address of exception vectors.
+ 
  source "init/Kconfig"
  
  menu "System Type"
@@@ -839,8 -842,6 +847,8 @@@ source "drivers/misc/Kconfig
  
  source "drivers/mfd/Kconfig"
  
 +source "drivers/leds/Kconfig"
 +
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"
@@@ -851,8 -852,6 +859,8 @@@ source "drivers/usb/Kconfig
  
  source "drivers/mmc/Kconfig"
  
 +source "drivers/rtc/Kconfig"
 +
  endmenu
  
  source "fs/Kconfig"