projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
[linux-2.6]
/
drivers
/
pcmcia
/
pxa2xx_lubbock.c
diff --git
a/drivers/pcmcia/pxa2xx_lubbock.c
b/drivers/pcmcia/pxa2xx_lubbock.c
index
37ec55d
..
6cbb1b1
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_lubbock.c
+++ b/
drivers/pcmcia/pxa2xx_lubbock.c
@@
-24,7
+24,6
@@
#include <mach/hardware.h>
#include <asm/hardware/sa1111.h>
#include <asm/mach-types.h>
-#include <mach/pxa-regs.h>
#include <mach/lubbock.h>
#include "sa1111_generic.h"