Commit e3463150 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Dominik Brodowski
Browse files

[PCMCIA] MPC8xx PCMCIA update 



Kconfig entry: dependency on 8xx
Makefile: fix whitespace breakage
m8xx_pcmcia.c:
	- asm/segment.h is gone
	- use generic PCMCIA suspend/resume methods

Signed-off-by: default avatarMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 5ab0b374

drivers/pcmcia/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config TCIC 


config PCMCIA_M8XX

        tristate "MPC8xx PCMCIA support"

        depends on PCMCIA && PPC

        depends on PCMCIA && PPC && 8xx 

        select PCCARD_NONSTATIC

        help

        Say Y here to include support for PowerPC 8xx series PCMCIA

drivers/pcmcia/m8xx_pcmcia.c

+3 −21
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 


#include <asm/io.h>

#include <asm/bitops.h>

#include <asm/segment.h>

#include <asm/system.h>



#include <linux/kernel.h>
@@ -50,6 +49,7 @@ 
#include <linux/ioport.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>



#include <asm/mpc8xx.h>

#include <asm/8xx_immap.h>
@@ -546,29 +546,11 @@ static void m8xx_shutdown(void) 
	free_irq(pcmcia_schlvl, NULL);

}



/* copied from tcic.c */



static int m8xx_drv_suspend(struct device *dev, pm_message_t state, u32 level)

{

        int ret = 0;

        if (level == SUSPEND_SAVE_STATE)

                ret = pcmcia_socket_dev_suspend(dev, state);

        return ret;

}



static int m8xx_drv_resume(struct device *dev, u32 level)

{

        int ret = 0;

        if (level == RESUME_RESTORE_STATE)

                ret = pcmcia_socket_dev_resume(dev);

        return ret;

}



static struct device_driver m8xx_driver = {

        .name = "m8xx-pcmcia",

        .bus = &platform_bus_type,

        .suspend = m8xx_drv_suspend,

        .resume = m8xx_drv_resume,

        .suspend = pcmcia_socket_dev_suspend,

        .resume = pcmcia_socket_dev_resume,

};



static struct platform_device m8xx_device = {

drivers/pcmcia/Makefile

+3 −3

File changed.

Contains only whitespace changes.