diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2006-07-26 23:15:13 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:39 +0200 |
| commit | 0f5e02cac96eaeb7645c4ff4470809e97cd86bfa (patch) | |
| tree | c9885a409c45c89564b5f6b99427728fd15854bb /i386 | |
| parent | d5ca6ad6dab83572dbdafbdec34d129d5da5a1c1 (diff) | |
2006-07-27 Stefan Siegl <stesie@brokenpipe.de>
* i386/i386at/i386at_ds_routines.c (emulation_list)
[LINUX_DEV && CONFIG_INET && CONFIG_PCMCIA]: Add the Linux pcmcia
emulation structure.
* linux/dev/glue/net.c: Include <linux/wireless.h>.
(device_get_status): Rewrite function.
(device_set_status): New function.
(linux_net_emulation_ops): Add `device_set_status' at the appropriate
position.
* linux/dev/init/main.c (linux_init) [CONFIG_PCMCIA]: Call pcmcia_init.
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/i386at/i386at_ds_routines.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/i386/i386at/i386at_ds_routines.c b/i386/i386at/i386at_ds_routines.c index 2a52a67..b4387d6 100644 --- a/i386/i386at/i386at_ds_routines.c +++ b/i386/i386at/i386at_ds_routines.c @@ -45,6 +45,9 @@ extern struct device_emulation_ops mach_device_emulation_ops; extern struct device_emulation_ops linux_block_emulation_ops; #ifdef CONFIG_INET extern struct device_emulation_ops linux_net_emulation_ops; +#ifdef CONFIG_PCMCIA +extern struct device_emulation_ops linux_pcmcia_emulation_ops; +#endif #endif #endif @@ -55,6 +58,9 @@ static struct device_emulation_ops *emulation_list[] = &linux_block_emulation_ops, #ifdef CONFIG_INET &linux_net_emulation_ops, +#ifdef CONFIG_PCMCIA + &linux_pcmcia_emulation_ops, +#endif #endif #endif &mach_device_emulation_ops, |