summaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 08:57:51 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-23 02:16:09 +0200
commit1a53088c101789bfca431de709ff6e45e8c77003 (patch)
treeb73ded75664ae5ae2ecfc1f611e6345b4e536110 /include/pcmcia
parent64f346425175ad33812cd693fbca48cd512dab63 (diff)
downloadlinux-1a53088c101789bfca431de709ff6e45e8c77003.tar.bz2
pcmcia: move config_info_t definition to ioctl-related parts in header files
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/cs.h21
-rw-r--r--include/pcmcia/ds.h21
2 files changed, 21 insertions, 21 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index ea51a8c4cc50..201705c51bbd 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -73,27 +73,6 @@ typedef struct event_callback_args_t {
void *client_data;
} event_callback_args_t;
-/* for GetConfigurationInfo */
-typedef struct config_info_t {
- u_char Function;
- u_int Attributes;
- u_int Vcc, Vpp1, Vpp2;
- u_int IntType;
- u_int ConfigBase;
- u_char Status, Pin, Copy, Option, ExtStatus;
- u_int Present;
- u_int CardValues;
- u_int AssignedIRQ;
- u_int IRQAttributes;
- ioaddr_t BasePort1;
- ioaddr_t NumPorts1;
- u_int Attributes1;
- ioaddr_t BasePort2;
- ioaddr_t NumPorts2;
- u_int Attributes2;
- u_int IOAddrLines;
-} config_info_t;
-
/* For CardValues field */
#define CV_OPTION_VALUE 0x01
#define CV_STATUS_VALUE 0x02
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 2d36a4f80e5b..a06bbec386bd 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -74,6 +74,27 @@ typedef struct cisdump_t {
cisdata_t Data[CISTPL_MAX_CIS_SIZE];
} cisdump_t;
+/* for GetConfigurationInfo */
+typedef struct config_info_t {
+ u_char Function;
+ u_int Attributes;
+ u_int Vcc, Vpp1, Vpp2;
+ u_int IntType;
+ u_int ConfigBase;
+ u_char Status, Pin, Copy, Option, ExtStatus;
+ u_int Present;
+ u_int CardValues;
+ u_int AssignedIRQ;
+ u_int IRQAttributes;
+ ioaddr_t BasePort1;
+ ioaddr_t NumPorts1;
+ u_int Attributes1;
+ ioaddr_t BasePort2;
+ ioaddr_t NumPorts2;
+ u_int Attributes2;
+ u_int IOAddrLines;
+} config_info_t;
+
typedef union ds_ioctl_arg_t {
adjust_t adjust;
config_info_t config;