diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-23 02:31:08 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 08:30:38 -0400 |
commit | ad19dbdb4b224deabbf6080e238256ffbc9be485 (patch) | |
tree | f1ba0293a6d3fca65b251bf77e254283e5c3517a /drivers/pcmcia | |
parent | 55b6c8e99d582cc66947b465d0ff3147a0219808 (diff) |
pcmcia: Use linux/of_{device,platform}.h instead of asm
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Vitaly Bordug <vitb@kernel.crashing.org>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/electra_cf.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 52d0aa8c2e7a..c21f9a9c3e3f 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
31 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
32 | #include <linux/of_platform.h> | ||
32 | 33 | ||
33 | #include <pcmcia/ss.h> | 34 | #include <pcmcia/ss.h> |
34 | #include <asm/of_platform.h> | ||
35 | 35 | ||
36 | static const char driver_name[] = "electra-cf"; | 36 | static const char driver_name[] = "electra-cf"; |
37 | 37 | ||
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index ac70d2cb7dd4..9c5be9a2f3fd 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -49,6 +49,8 @@ | |||
49 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
50 | #include <linux/fsl_devices.h> | 50 | #include <linux/fsl_devices.h> |
51 | #include <linux/bitops.h> | 51 | #include <linux/bitops.h> |
52 | #include <linux/of_device.h> | ||
53 | #include <linux/of_platform.h> | ||
52 | 54 | ||
53 | #include <asm/io.h> | 55 | #include <asm/io.h> |
54 | #include <asm/system.h> | 56 | #include <asm/system.h> |
@@ -57,8 +59,6 @@ | |||
57 | #include <asm/8xx_immap.h> | 59 | #include <asm/8xx_immap.h> |
58 | #include <asm/irq.h> | 60 | #include <asm/irq.h> |
59 | #include <asm/fs_pd.h> | 61 | #include <asm/fs_pd.h> |
60 | #include <asm/of_device.h> | ||
61 | #include <asm/of_platform.h> | ||
62 | 62 | ||
63 | #include <pcmcia/version.h> | 63 | #include <pcmcia/version.h> |
64 | #include <pcmcia/cs_types.h> | 64 | #include <pcmcia/cs_types.h> |