Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad19dbdb authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

pcmcia: Use linux/of_{device,platform}.h instead of asm 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarVitaly Bordug <vitb@kernel.crashing.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 55b6c8e9

drivers/pcmcia/electra_cf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,9 +29,9 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

#include <linux/of_platform.h>





#include <pcmcia/ss.h>

#include <pcmcia/ss.h>

#include <asm/of_platform.h>





static const char driver_name[] = "electra-cf";

static const char driver_name[] = "electra-cf";

drivers/pcmcia/m8xx_pcmcia.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,6 +49,8 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/fsl_devices.h>

#include <linux/fsl_devices.h>

#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>





#include <asm/io.h>

#include <asm/io.h>

#include <asm/system.h>

#include <asm/system.h>
@@ -57,8 +59,6 @@ 
#include <asm/8xx_immap.h>

#include <asm/8xx_immap.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/fs_pd.h>

#include <asm/fs_pd.h>

#include <asm/of_device.h>

#include <asm/of_platform.h>





#include <pcmcia/version.h>

#include <pcmcia/version.h>

#include <pcmcia/cs_types.h>

#include <pcmcia/cs_types.h>