diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-22 08:31:36 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-22 08:31:36 +1000 |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /drivers/char/pcmcia/ipwireless/main.h | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 (diff) | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 (diff) | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.h')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/main.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h index 0e0363af9ab2..96d0ef31b172 100644 --- a/drivers/char/pcmcia/ipwireless/main.h +++ b/drivers/char/pcmcia/ipwireless/main.h @@ -54,7 +54,6 @@ struct ipw_dev { void __iomem *common_memory; win_req_t request_common_memory; - dev_node_t nodes[2]; /* Reference to attribute memory, containing CIS data */ void *attribute_memory; |