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 /linux/dev/init | |
| 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 'linux/dev/init')
| -rw-r--r-- | linux/dev/init/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c index 0c14353..fa932bd 100644 --- a/linux/dev/init/main.c +++ b/linux/dev/init/main.c @@ -103,6 +103,7 @@ extern int linux_bad_intr (int); extern int prtnull (); extern int intnull (); extern void linux_sched_init (void); +extern void pcmcia_init (void); /* @@ -179,10 +180,19 @@ linux_init (void) #ifdef CONFIG_INET linux_net_emulation_init (); #endif + cli (); device_setup (); +#ifdef CONFIG_PCMCIA + /* + * Initialize pcmcia. + */ + pcmcia_init (); +#endif + restore_IRQ (); + linux_auto_config = 0; } |