diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
tree | 9b08af78085334af44414adafe0096276f8fe0ff /include/pcmcia | |
parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) |
Merge ARM fixes
Diffstat (limited to 'include/pcmcia')
-rw-r--r-- | include/pcmcia/ciscode.h | 1 | ||||
-rw-r--r-- | include/pcmcia/ss.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h index c1da8558339a..eae7e2e84497 100644 --- a/include/pcmcia/ciscode.h +++ b/include/pcmcia/ciscode.h | |||
@@ -95,6 +95,7 @@ | |||
95 | #define PRODID_QUATECH_DUAL_RS232 0x0012 | 95 | #define PRODID_QUATECH_DUAL_RS232 0x0012 |
96 | #define PRODID_QUATECH_DUAL_RS232_D1 0x0007 | 96 | #define PRODID_QUATECH_DUAL_RS232_D1 0x0007 |
97 | #define PRODID_QUATECH_DUAL_RS232_D2 0x0052 | 97 | #define PRODID_QUATECH_DUAL_RS232_D2 0x0052 |
98 | #define PRODID_QUATECH_DUAL_RS232_G 0x004d | ||
98 | #define PRODID_QUATECH_QUAD_RS232 0x001b | 99 | #define PRODID_QUATECH_QUAD_RS232 0x001b |
99 | #define PRODID_QUATECH_DUAL_RS422 0x000e | 100 | #define PRODID_QUATECH_DUAL_RS422 0x000e |
100 | #define PRODID_QUATECH_QUAD_RS422 0x0045 | 101 | #define PRODID_QUATECH_QUAD_RS422 0x0045 |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 623a0fc0dae1..6e84258b94de 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -284,7 +284,7 @@ struct pcmcia_socket { | |||
284 | #endif | 284 | #endif |
285 | 285 | ||
286 | /* socket device */ | 286 | /* socket device */ |
287 | struct class_device dev; | 287 | struct device dev; |
288 | void *driver_data; /* data internal to the socket driver */ | 288 | void *driver_data; /* data internal to the socket driver */ |
289 | 289 | ||
290 | }; | 290 | }; |