git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
mpp.c
diff --git
a/arch/arm/mach-kirkwood/mpp.c
b/arch/arm/mach-kirkwood/mpp.c
index
b0a7d97
..
cc431fa
100644
(file)
--- a/
arch/arm/mach-kirkwood/mpp.c
+++ b/
arch/arm/mach-kirkwood/mpp.c
@@
-7,12
+7,11
@@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mbus.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mbus.h>
#include <linux/io.h>
-#include <asm/gpio.h>
#include <mach/hardware.h>
#include <plat/mpp.h>
#include "common.h"
#include <mach/hardware.h>
#include <plat/mpp.h>
#include "common.h"