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 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
corgi.c
diff --git
a/arch/arm/mach-pxa/corgi.c
b/arch/arm/mach-pxa/corgi.c
index 7ffd2de8f2f30f6d0eefd2a9d1c14f32a73aa91c..68923b1d2b62b1f1a2490a90d3033c45c2f1d269 100644
(file)
--- a/
arch/arm/mach-pxa/corgi.c
+++ b/
arch/arm/mach-pxa/corgi.c
@@
-32,7
+32,6
@@
#include <asm/mach/irq.h>
#include <asm/arch/pxa-regs.h>
-#include <asm/arch/irq.h>
#include <asm/arch/irda.h>
#include <asm/arch/mmc.h>
#include <asm/arch/udc.h>