[PATCH 07/12] pcmcia: use linux/of_{device,platform}.h instead of asm

[Vitaly Bordug]

В Fri, 23 May 2008 16:31:08 +1000
Stephen Rothwell <sfr at canb.auug.org.au> пишет:

> 
> Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Vitaly Bordug <vitb at kernel.crashing.org>
> ---
>  drivers/pcmcia/electra_cf.c  |    2 +-
>  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 0a6cea1..0f5cea8 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>