From: Tony Lindgren <tony@atomide.com>
Date: Tue, 7 Oct 2008 11:27:17 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~57
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b99e69f31fa575e53483e1f90c3a88939ca0b95;hp=-c;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

5b99e69f31fa575e53483e1f90c3a88939ca0b95
diff --combined Makefile
index 5fe5788071f,ce9eceb2538..cd253ffa751
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 27
- EXTRAVERSION = -rc8
+ EXTRAVERSION = -rc9
  NAME = Rotary Wombat
  
  # *DOCUMENTATION*
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -174,8 -171,6 +174,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
  				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
  				  -e s/sh.*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -196,7 -191,7 +196,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH		?= $(SUBARCH)
 -CROSS_COMPILE	?=
 +CROSS_COMPILE	?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE 	:= $(ARCH)
diff --combined drivers/mfd/Kconfig
index e70e19aa11f,68dc8d9eb24..e643f6bb81c
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -21,7 -21,7 +21,7 @@@ config MFD_SM50
  
  config MFD_SM501_GPIO
  	bool "Export GPIO via GPIO layer"
- 	depends on MFD_SM501 && HAVE_GPIO_LIB
+ 	depends on MFD_SM501 && GPIOLIB
  	 ---help---
  	 This option uses the gpio library layer to export the 64 GPIO
  	 lines on the SM501. The platform data is used to supply the
@@@ -29,7 -29,7 +29,7 @@@
  
  config MFD_ASIC3
  	bool "Support for Compaq ASIC3"
- 	depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+ 	depends on GENERIC_HARDIRQS && GPIOLIB && ARM
  	 ---help---
  	  This driver supports the ASIC3 multifunction chip found on many
  	  PDAs (mainly iPAQ and HTC based ones)
@@@ -50,20 -50,6 +50,20 @@@ config HTC_PASIC
  	  HTC Magician devices, respectively. Actual functionality is
  	  handled by the leds-pasic3 and ds1wm drivers.
  
 +config TWL4030_CORE
 +	bool "Texas Instruments TWL4030/TPS659x0 Support"
 +	depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
 +	help
 +	  Say yes here if you have TWL4030 family chip on your board.
 +	  This core driver provides register access and IRQ handling
 +	  facilities, and registers devices for the various functions
 +	  so that function-specific drivers can bind to them.
 +
 +	  These multi-function chips are found on many OMAP2 and OMAP3
 +	  boards, providing power management, RTC, GPIO, keypad, a
 +	  high speed USB OTG transceiver, an audio codec (on most
 +	  versions) and many other features.
 +
  config MFD_TMIO
  	bool
  	default n