diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/char/pcmcia/ipwireless/main.h | |
parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.h')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h index 1bfdcc8d47d6..0e0363af9ab2 100644 --- a/drivers/char/pcmcia/ipwireless/main.h +++ b/drivers/char/pcmcia/ipwireless/main.h | |||
@@ -45,10 +45,15 @@ struct ipw_tty; | |||
45 | struct ipw_dev { | 45 | struct ipw_dev { |
46 | struct pcmcia_device *link; | 46 | struct pcmcia_device *link; |
47 | int is_v2_card; | 47 | int is_v2_card; |
48 | |||
48 | window_handle_t handle_attr_memory; | 49 | window_handle_t handle_attr_memory; |
49 | void __iomem *attr_memory; | 50 | void __iomem *attr_memory; |
51 | win_req_t request_attr_memory; | ||
52 | |||
50 | window_handle_t handle_common_memory; | 53 | window_handle_t handle_common_memory; |
51 | void __iomem *common_memory; | 54 | void __iomem *common_memory; |
55 | win_req_t request_common_memory; | ||
56 | |||
52 | dev_node_t nodes[2]; | 57 | dev_node_t nodes[2]; |
53 | /* Reference to attribute memory, containing CIS data */ | 58 | /* Reference to attribute memory, containing CIS data */ |
54 | void *attribute_memory; | 59 | void *attribute_memory; |