From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:11:34 +0000 (+0100)
Subject: Merge branch 'dt/gic' into highbank/soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09fa31a322c8f03871a741cd1d26e5ca04aacbbd;p=linux-beck.git

Merge branch 'dt/gic' into highbank/soc

Conflicts:
	arch/arm/Kconfig
---

09fa31a322c8f03871a741cd1d26e5ca04aacbbd
diff --cc arch/arm/Kconfig
index 4792d2928fa3,0c5f37f4eddb..7bbb03558d2c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -835,7 -861,7 +861,8 @@@ config ARCH_U30
  	select CLKDEV_LOOKUP
  	select HAVE_MACH_CLKDEV
  	select GENERIC_GPIO
 +	select ARCH_REQUIRE_GPIOLIB
+ 	select NEED_MACH_MEMORY_H
  	help
  	  Support for ST-Ericsson U300 series mobile platforms.
  
diff --cc arch/arm/mach-pxa/irq.c
index d493a230addf,ca6075717824..8d9200f92268
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@@ -18,9 -19,11 +18,11 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  
+ #include <asm/exception.h>
+ 
  #include <mach/hardware.h>
  #include <mach/irqs.h>
 -#include <mach/gpio.h>
 +#include <mach/gpio-pxa.h>
  
  #include "generic.h"