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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
pcmcia
/
pxa2xx_base.c
diff --git
a/drivers/pcmcia/pxa2xx_base.c
b/drivers/pcmcia/pxa2xx_base.c
index
f370476
..
ae07b4d
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_base.c
+++ b/
drivers/pcmcia/pxa2xx_base.c
@@
-32,7
+32,6
@@
#include <mach/pxa2xx-regs.h>
#include <asm/mach-types.h>
-#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cistpl.h>