projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
drivers
/
pcmcia
/
cs_internal.h
diff --git
a/drivers/pcmcia/cs_internal.h
b/drivers/pcmcia/cs_internal.h
index
6bbfbd0
..
55867bc
100644
(file)
--- a/
drivers/pcmcia/cs_internal.h
+++ b/
drivers/pcmcia/cs_internal.h
@@
-17,9
+17,6
@@
#include <linux/config.h>
#include <linux/config.h>
-#define CLIENT_MAGIC 0x51E6
-typedef struct client_t client_t;
-
/* Flags in client state */
#define CLIENT_CONFIG_LOCKED 0x0001
#define CLIENT_IRQ_REQ 0x0002
/* Flags in client state */
#define CLIENT_CONFIG_LOCKED 0x0001
#define CLIENT_IRQ_REQ 0x0002
@@
-45,7
+42,6
@@
typedef struct region_t {
typedef struct config_t {
u_int state;
u_int Attributes;
typedef struct config_t {
u_int state;
u_int Attributes;
- u_int Vcc, Vpp1, Vpp2;
u_int IntType;
u_int ConfigBase;
u_char Status, Pin, Copy, Option, ExtStatus;
u_int IntType;
u_int ConfigBase;
u_char Status, Pin, Copy, Option, ExtStatus;