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 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
drivers
/
pcmcia
/
pxa2xx_viper.c
diff --git
a/drivers/pcmcia/pxa2xx_viper.c
b/drivers/pcmcia/pxa2xx_viper.c
index
dd10481
..
1787136
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_viper.c
+++ b/
drivers/pcmcia/pxa2xx_viper.c
@@
-26,7
+26,6
@@
#include <asm/irq.h>
-#include <mach/pxa-regs.h>
#include <mach/viper.h>
#include <asm/mach-types.h>