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.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
ixp4xx-beeper.c
diff --git
a/drivers/input/misc/ixp4xx-beeper.c
b/drivers/input/misc/ixp4xx-beeper.c
index
798d84c
..
9946d73
100644
(file)
--- a/
drivers/input/misc/ixp4xx-beeper.c
+++ b/
drivers/input/misc/ixp4xx-beeper.c
@@
-20,7
+20,7
@@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("ixp4xx beeper driver");