projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
pxa2xx_cm_x2xx.c
diff --git
a/drivers/pcmcia/pxa2xx_cm_x2xx.c
b/drivers/pcmcia/pxa2xx_cm_x2xx.c
index 4f09506ad8d49398d03918227303dda202b674fe..6e7dcfd22ede8c5696cb68b80528bb94ddf9b2f1 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_cm_x2xx.c
+++ b/
drivers/pcmcia/pxa2xx_cm_x2xx.c
@@
-12,9
+12,8
@@
#include <linux/module.h>
-#include <asm/system.h>
#include <asm/mach-types.h>
-#include <mach/
system
.h>
+#include <mach/
hardware
.h>
int cmx255_pcmcia_init(void);
int cmx270_pcmcia_init(void);