From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Oct 2012 04:39:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Tag: next-20121031~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6aa03501cdd08d37c61a27b832d0c349c32d9d0e;p=karo-tx-linux.git

Merge remote-tracking branch 'pinctrl/for-next'
---

6aa03501cdd08d37c61a27b832d0c349c32d9d0e
diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index 3f97ef40ce6b,22ef8a1abe08..ab7104fded39
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -33,10 -33,11 +34,8 @@@
  #include <asm/mach/flash.h>
  #include <asm/mach/time.h>
  
- #include <plat/gpio-nomadik.h>
  #include <plat/mtu.h>
- #include <plat/pincfg.h>
  
 -#include <linux/platform_data/mtd-nomadik-nand.h>
 -#include <mach/fsmc.h>
 -
  #include "cpu-8815.h"
  
  /* Initial value for SRC control register: all timers use MXTAL/8 source */