From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 9 Oct 2008 20:33:05 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
X-Git-Tag: v2.6.28-rc1~293^2~4
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c97f68145e8067b3ac4b126a6faebf90f9ffc302;p=linux-2.6-omap-h63xx.git

Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel
---

c97f68145e8067b3ac4b126a6faebf90f9ffc302
diff --cc arch/arm/Kconfig
index 960d5a54aec,ea3c858d753..5f6e34925a3
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -524,8 -515,8 +524,9 @@@ config ARCH_DAVINC
  	select GENERIC_TIME
  	select GENERIC_CLOCKEVENTS
  	select GENERIC_GPIO
+ 	select ARCH_REQUIRE_GPIOLIB
  	select HAVE_CLK
 +	select ZONE_DMA
  	help
  	  Support for TI's DaVinci platform.
  
diff --cc arch/arm/mach-davinci/board-evm.c
index 41f3cc4ac4a,9581675f658..a957d239a68
--- a/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
@@@ -16,11 -23,10 +23,10 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
 +#include <linux/io.h>
  
  #include <asm/setup.h>
 -#include <asm/io.h>
  #include <asm/mach-types.h>
- #include <mach/hardware.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>