Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a45b3f...
Commit: a45b3fb19ba1e4dfc3fc53563a072612092930a9
Parent: 272433e088f843dc4dd5a5ad38dd68b9a93dcebf
Author: Dominik Brodowski <linux@dominikbrodowski.net>
AuthorDate: Sun Aug 31 16:00:42 2008 +0200
Committer: Dominik Brodowski <linux@dominikbrodowski.net>
CommitDate: Sun Aug 31 16:00:42 2008 +0200
pcmcia: ioctl-internal definitions
cisinfo_t and cs_status_t are only used by the (deprecated) PCMCIA
ioctl. Therefore, move them out of the way.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
include/pcmcia/cistpl.h | 5 -----
include/pcmcia/cs.h | 6 ------
include/pcmcia/ds.h | 11 +++++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index 026323b..cfdd5af 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -573,11 +573,6 @@ typedef struct tuple_t {
#define TUPLE_RETURN_LINK 0x01
#define TUPLE_RETURN_COMMON 0x02
-/* For ValidateCIS */
-typedef struct cisinfo_t {
- u_int Chains;
-} cisinfo_t;
-
#define CISTPL_MAX_CIS_SIZE 0x200
#endif /* LINUX_CISTPL_H */
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 6944a74..904468a 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -201,12 +201,6 @@ typedef struct win_req_t {
#define WIN_BAR_MASK 0xe000
#define WIN_BAR_SHIFT 13
-typedef struct cs_status_t {
- u_char Function;
- event_t CardState;
- event_t SocketState;
-} cs_status_t;
-
typedef struct error_info_t {
int func;
int retcode;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 5fb6195..a2be80b 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -367,6 +367,17 @@ typedef struct config_info_t {
u_int IOAddrLines;
} config_info_t;
+/* For ValidateCIS */
+typedef struct cisinfo_t {
+ u_int Chains;
+} cisinfo_t;
+
+typedef struct cs_status_t {
+ u_char Function;
+ event_t CardState;
+ event_t SocketState;
+} cs_status_t;
+
typedef union ds_ioctl_arg_t {
adjust_t adjust;
config_info_t config;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
