git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
board-osk.c
diff --git
a/arch/arm/mach-omap1/board-osk.c
b/arch/arm/mach-omap1/board-osk.c
index 3a622801d7b0f1548a98056250860a5cea4bac37..7d0cf7af88ceb8c420b5fdb912edf3f3358170f8 100644
(file)
--- a/
arch/arm/mach-omap1/board-osk.c
+++ b/
arch/arm/mach-omap1/board-osk.c
@@
-30,6
+30,7
@@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/irq.h>
+#include <linux/interrupt.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>