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-linus' of git://git.selinuxproject.org/~jmorris/linux-security
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-cam60.c
diff --git
a/arch/arm/mach-at91/board-cam60.c
b/arch/arm/mach-at91/board-cam60.c
index
d1abd58
..
747b2ea
100644
(file)
--- a/
arch/arm/mach-at91/board-cam60.c
+++ b/
arch/arm/mach-at91/board-cam60.c
@@
-21,6
+21,7
@@
*/
#include <linux/types.h>
*/
#include <linux/types.h>
+#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
@@
-38,7
+39,6
@@
#include <asm/mach/irq.h>
#include <mach/board.h>
#include <asm/mach/irq.h>
#include <mach/board.h>
-#include <mach/gpio.h>
#include <mach/at91sam9_smc.h>
#include "sam9_smc.h"
#include <mach/at91sam9_smc.h>
#include "sam9_smc.h"