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 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ks8695
/
board-micrel.c
diff --git
a/arch/arm/mach-ks8695/board-micrel.c
b/arch/arm/mach-ks8695/board-micrel.c
index
e2e3cba
..
9b9c47c
100644
(file)
--- a/
arch/arm/mach-ks8695/board-micrel.c
+++ b/
arch/arm/mach-ks8695/board-micrel.c
@@
-5,7
+5,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/interrupt.h>
@@
-18,7
+18,7
@@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/gpio.h>
+#include <mach/gpio
-ks8695
.h>
#include <mach/devices.h>
#include "generic.h"
#include <mach/devices.h>
#include "generic.h"