diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-23 16:31:08 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 22:30:38 +1000 |
| commit | ad19dbdb4b224deabbf6080e238256ffbc9be485 (patch) | |
| tree | f1ba0293a6d3fca65b251bf77e254283e5c3517a /drivers/pcmcia | |
| parent | 55b6c8e99d582cc66947b465d0ff3147a0219808 (diff) | |
| download | op-kernel-dev-ad19dbdb4b224deabbf6080e238256ffbc9be485.zip op-kernel-dev-ad19dbdb4b224deabbf6080e238256ffbc9be485.tar.gz | |
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 52d0aa8..c21f9a9 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c @@ -29,9 +29,9 @@ #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/vmalloc.h> +#include <linux/of_platform.h> #include <pcmcia/ss.h> -#include <asm/of_platform.h> static const char driver_name[] = "electra-cf"; diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index ac70d2c..9c5be9a 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c @@ -49,6 +49,8 @@ #include <linux/interrupt.h> #include <linux/fsl_devices.h> #include <linux/bitops.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> #include <asm/io.h> #include <asm/system.h> @@ -57,8 +59,6 @@ #include <asm/8xx_immap.h> #include <asm/irq.h> #include <asm/fs_pd.h> -#include <asm/of_device.h> -#include <asm/of_platform.h> #include <pcmcia/version.h> #include <pcmcia/cs_types.h> |
