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

Commit 04ba0f65 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: avoid registering multiple pxa2xx_pcmcia devices 



cm_x270 and mainstone both register their PCMCIA devices using the same
name, resulting in a warning message from the kernel.  Avoid this by
making the cm_x270 and mainstone PCMCIA initialisation conditional on
the machine type we're running on.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 720046de

drivers/pcmcia/pxa2xx_cm_x270.c

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <pcmcia/ss.h>

#include <asm/hardware.h>

#include <asm/mach-types.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-gpio.h>
@@ -147,6 +148,9 @@ static int __init cmx270_pcmcia_init(void) 
{

	int ret;



	if (!machine_is_armcore())

		return -ENODEV;



	cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);



	if (!cmx270_pcmcia_device)

drivers/pcmcia/pxa2xx_mainstone.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <pcmcia/ss.h>



#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>



#include <asm/arch/pxa-regs.h>
@@ -153,6 +154,9 @@ static int __init mst_pcmcia_init(void) 
{

	int ret;



	if (!machine_is_mainstone())

		return -ENODEV;



	mst_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);

	if (!mst_pcmcia_device)

		return -ENOMEM;