Commit f6024824 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

into home.osdl.org:/home/torvalds/v2.5/linux
parents 72847a2a c8635fbc
......@@ -2342,19 +2342,7 @@ static struct pcmcia_driver wl3501_driver = {
static int __init wl3501_init_module(void)
{
servinfo_t serv;
dprintk(0, ": loading");
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE
"wl3501_cs: Card Services release does not match!\n"
"Compiled with 0x%x, but current is 0x%lx\n",
CS_RELEASE_CODE, (unsigned long)serv.Revision);
/* return -1; */
}
pcmcia_register_driver(&wl3501_driver);
return 0;
return pcmcia_register_driver(&wl3501_driver);
}
static void __exit wl3501_exit_module(void)
......
......@@ -136,7 +136,6 @@ static spinlock_t pcmcia_lock = SPIN_LOCK_UNLOCKED;
static int __init au1000_pcmcia_driver_init(void)
{
servinfo_t info;
struct pcmcia_init pcmcia_init;
struct pcmcia_state state;
unsigned int i;
......@@ -148,13 +147,6 @@ static int __init au1000_pcmcia_driver_init(void)
return -1;
#endif
CardServices(GetCardServicesInfo, &info);
if(info.Revision!=CS_RELEASE_CODE){
printk(KERN_ERR "Card Services release codes do not match\n");
return -1;
}
#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500)
pcmcia_low_level=&pb1x00_pcmcia_ops;
#else
......
......@@ -884,19 +884,9 @@ static struct platform_device hd64465_device = {
static int __init init_hs(void)
{
servinfo_t serv;
int i;
unsigned short v;
/*
* Check API version
*/
pcmcia_get_card_services_info(&serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE MODNAME ": Card Services release does not match!\n");
return -ENODEV;
}
/* hd64465_io_debug = 1; */
if (driver_register(&hd64465_driver))
return -EINVAL;
......
......@@ -1365,16 +1365,8 @@ static struct platform_device i82365_device = {
static int __init init_i82365(void)
{
servinfo_t serv;
int i, ret;
pcmcia_get_card_services_info(&serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "i82365: Card Services release "
"does not match!\n");
return -1;
}
DEBUG(0, "%s\n", version);
if (driver_register(&i82365_driver))
return -1;
......
......@@ -379,15 +379,6 @@ static int __init init_tcic(void)
{
int i, sock, ret = 0;
u_int mask, scan;
servinfo_t serv;
DEBUG(0, "%s\n", version);
pcmcia_get_card_services_info(&serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "tcic: Card Services release "
"does not match!\n");
return -1;
}
if (driver_register(&tcic_driver))
return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment