aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pcmcia/Makefile2
-rw-r--r--drivers/pcmcia/pcmcia_compat.c64
2 files changed, 1 insertions, 65 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index bcecf5133b7e..22e17fdfa741 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -10,7 +10,7 @@ pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o
10pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o 10pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
11obj-$(CONFIG_PCCARD) += pcmcia_core.o 11obj-$(CONFIG_PCCARD) += pcmcia_core.o
12 12
13pcmcia-y += ds.o pcmcia_compat.o pcmcia_resource.o 13pcmcia-y += ds.o pcmcia_resource.o
14pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o 14pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o
15obj-$(CONFIG_PCMCIA) += pcmcia.o 15obj-$(CONFIG_PCMCIA) += pcmcia.o
16 16
diff --git a/drivers/pcmcia/pcmcia_compat.c b/drivers/pcmcia/pcmcia_compat.c
deleted file mode 100644
index 734f28085a9d..000000000000
--- a/drivers/pcmcia/pcmcia_compat.c
+++ /dev/null
@@ -1,64 +0,0 @@
1/*
2 * PCMCIA 16-bit compatibility functions
3 *
4 * The initial developer of the original code is David A. Hinds
5 * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
6 * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
7 *
8 * Copyright (C) 2004 Dominik Brodowski
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation.
13 *
14 */
15
16#include <linux/module.h>
17#include <linux/init.h>
18
19#define IN_CARD_SERVICES
20#include <pcmcia/cs_types.h>
21#include <pcmcia/cs.h>
22#include <pcmcia/bulkmem.h>
23#include <pcmcia/cistpl.h>
24#include <pcmcia/ds.h>
25#include <pcmcia/ss.h>
26
27#include "cs_internal.h"
28
29int pcmcia_get_first_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)
30{
31 return pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple);
32}
33EXPORT_SYMBOL(pcmcia_get_first_tuple);
34
35int pcmcia_get_next_tuple(struct pcmcia_device *p_dev, tuple_t *tuple)
36{
37 return pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple);
38}
39EXPORT_SYMBOL(pcmcia_get_next_tuple);
40
41int pcmcia_get_tuple_data(struct pcmcia_device *p_dev, tuple_t *tuple)
42{
43 return pccard_get_tuple_data(p_dev->socket, tuple);
44}
45EXPORT_SYMBOL(pcmcia_get_tuple_data);
46
47int pcmcia_parse_tuple(struct pcmcia_device *p_dev, tuple_t *tuple, cisparse_t *parse)
48{
49 return pccard_parse_tuple(tuple, parse);
50}
51EXPORT_SYMBOL(pcmcia_parse_tuple);
52
53int pcmcia_validate_cis(struct pcmcia_device *p_dev, cisinfo_t *info)
54{
55 return pccard_validate_cis(p_dev->socket, p_dev->func, info);
56}
57EXPORT_SYMBOL(pcmcia_validate_cis);
58
59
60int pcmcia_reset_card(struct pcmcia_device *p_dev, client_req_t *req)
61{
62 return pccard_reset_card(p_dev->socket);
63}
64EXPORT_SYMBOL(pcmcia_reset_card);