From 0f5e02cac96eaeb7645c4ff4470809e97cd86bfa Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 26 Jul 2006 23:15:13 +0000 Subject: 2006-07-27 Stefan Siegl * 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 . (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. --- linux/dev/init/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'linux/dev/init/main.c') diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c index 0c143532..fa932bde 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; } -- cgit v1.2.3