From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 23 Dec 2008 18:06:37 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.29-rc1~559^2~3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb;p=linux-2.6-omap-h63xx.git

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/mach-pxa/am200epd.c
	arch/arm/mach-pxa/ezx.c
---

40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb
diff --cc arch/arm/mach-pxa/am200epd.c
index 3a4f8d855a5,fd614205457..77ee80e5e47
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@@ -335,16 -331,7 +335,16 @@@ static struct metronome_board am200_boa
  	.cleanup		= am200_cleanup,
  };
  
 +static unsigned long am200_pin_config[] __initdata = {
 +	GPIO51_GPIO,
 +	GPIO49_GPIO,
 +	GPIO48_GPIO,
 +	GPIO32_GPIO,
 +	GPIO17_GPIO,
 +	GPIO16_GPIO,
 +};
 +
- static int __init am200_init(void)
+ int __init am200_init(void)
  {
  	int ret;
  
diff --cc arch/arm/mach-pxa/ezx.c
index 3e6aa33a2c7,4f212e1b953..df5f822f3b6
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@@ -21,7 -22,7 +22,8 @@@
  #include <mach/pxafb.h>
  #include <mach/ohci.h>
  #include <mach/i2c.h>
 +#include <mach/hardware.h>
+ #include <mach/pxa27x_keypad.h>
  
  #include <mach/mfp-pxa27x.h>
  #include <mach/pxa-regs.h>
diff --cc arch/arm/mach-pxa/gumstix.c
index 06bc6674b01,14d5103dafc..e296ce11658
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@@ -184,8 -184,29 +184,22 @@@ static unsigned long gumstix_pin_config
  	GPIO6_MMC_CLK,
  	GPIO53_MMC_CLK,
  	GPIO8_MMC_CS0,
 -	/* these are used by AM200EPD */
 -	GPIO51_GPIO,
 -	GPIO49_GPIO,
 -	GPIO48_GPIO,
 -	GPIO32_GPIO,
 -	GPIO17_GPIO,
 -	GPIO16_GPIO,
  };
  
+ int __attribute__((weak)) am200_init(void)
+ {
+ 	return 0;
+ }
+ 
+ static void __init carrier_board_init(void)
+ {
+ 	/*
+ 	 * put carrier/expansion board init here if
+ 	 * they cannot be detected programatically
+ 	 */
+ 	am200_init();
+ }
+ 
  static void __init gumstix_init(void)
  {
  	pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));