Merge with /home/tmlind/src/kernel/linux-2.6

diff --combined Makefile
index f46022f4f994f4fb124e974186e6c3e53c927137,cb5790580fca2cea5b70a27b0359e198f589da0c..88a71bdbbd4443d3e48dbb767453b0936ad64cb9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 16
- EXTRAVERSION =-rc5
+ EXTRAVERSION =
  NAME=Sliding Snow Leopard
  
  # *DOCUMENTATION*
@@@ -10,9 -10,6 +10,9 @@@
  # Comments in this file are targeted only to the developer, do not
  # expect to learn how to build the kernel reading this file.
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # Do not print "Entering directory ..."
  MAKEFLAGS += --no-print-directory
  
@@@ -155,7 -152,6 +155,7 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                  -e s/ppc.*/powerpc/ )
 +SUBARCH := arm
  
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
@@@ -177,7 -173,7 +177,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE := $(ARCH)
@@@ -909,7 -905,7 +909,7 @@@ define filechk_version.
        )
  endef
  
- include/linux/version.h: $(srctree)/Makefile .config FORCE
+ include/linux/version.h: $(srctree)/Makefile .config .kernelrelease FORCE
        $(call filechk,version.h)
  
  # ---------------------------------------------------------------------------

diff --combined arch/arm/Kconfig
index 9ce860d8734af46bbe155b1209f62e14eb84155d,32ba00bd0a2f4398cde7bad3c602bdfda42ca48a..d26e3b3fc9f3c0a236b01b45b6665fee58e3c3af
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -78,7 -78,7 +78,7 @@@ menu "System Type
  
  choice
        prompt "ARM system type"
-       default ARCH_RPC
+       default ARCH_VERSATILE
  
  config ARCH_CLPS7500
        bool "Cirrus-CL-PS7500FE"
@@@ -497,7 -497,8 +497,7 @@@ config LED
          system, but the driver will do nothing.
  
  config LEDS_TIMER
 -      bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
 -                          MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
 +      bool "Timer LED" if !ARCH_CDB89712
        depends on LEDS
        default y if ARCH_EBSA110
        help
@@@ -512,7 -513,8 +512,7 @@@
          will overrule the CPU usage LED.
  
  config LEDS_CPU
 -      bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
 -                      !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
 +      bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110)
        depends on LEDS
        help
          If you say Y here, the red LED will be used to give a good real
@@@ -797,6 -799,8 +797,8 @@@ source "drivers/i2c/Kconfig
  
  source "drivers/spi/Kconfig"
  
+ source "drivers/w1/Kconfig"
+ 
  source "drivers/hwmon/Kconfig"
  
  #source "drivers/l3/Kconfig"
@@@ -815,12 -819,6 +817,12 @@@ source "drivers/usb/Kconfig
  
  source "drivers/mmc/Kconfig"
  
 +source "drivers/ssi/Kconfig"
 +
 +if ARCH_OMAP
 +source "drivers/cbus/Kconfig"
 +endif
 +
  endmenu
  
  source "fs/Kconfig"