diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/Space.c | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index a8c245a82261..9953201c670d 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -18,7 +18,7 @@ * - struct init cleanup, enable multiple ISA autoprobes. * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 09/1999 * - fix sbni: s/device/net_device/ - * Paul Gortmaker (06/98): + * Paul Gortmaker (06/98): * - sort probes in a sane way, make sure all (safe) probes * get run once & failed autoprobes don't autoprobe again. * @@ -91,7 +91,7 @@ extern struct net_device *mac89x0_probe(int unit); extern struct net_device *mc32_probe(int unit); extern struct net_device *cops_probe(int unit); extern struct net_device *ltpc_probe(void); - + /* Detachable devices ("pocket adaptors") */ extern struct net_device *de620_probe(int unit); @@ -129,10 +129,10 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe) */ static struct devprobe2 eisa_probes[] __initdata = { -#ifdef CONFIG_ULTRA32 - {ultra32_probe, 0}, +#ifdef CONFIG_ULTRA32 + {ultra32_probe, 0}, #endif -#ifdef CONFIG_AC3200 +#ifdef CONFIG_AC3200 {ac3200_probe, 0}, #endif #ifdef CONFIG_ES3210 @@ -167,14 +167,14 @@ static struct devprobe2 mca_probes[] __initdata = { static struct devprobe2 isa_probes[] __initdata = { #ifdef CONFIG_HP100 /* ISA, EISA & PCI */ {hp100_probe, 0}, -#endif +#endif #ifdef CONFIG_3C515 {tc515_probe, 0}, #endif -#ifdef CONFIG_ULTRA +#ifdef CONFIG_ULTRA {ultra_probe, 0}, #endif -#ifdef CONFIG_WD80x3 +#ifdef CONFIG_WD80x3 {wd_probe, 0}, #endif #ifdef CONFIG_EL2 /* 3c503 */ @@ -199,7 +199,7 @@ static struct devprobe2 isa_probes[] __initdata = { #ifdef CONFIG_SMC9194 {smc_init, 0}, #endif -#ifdef CONFIG_SEEQ8005 +#ifdef CONFIG_SEEQ8005 {seeq8005_probe, 0}, #endif #ifdef CONFIG_CS89x0 @@ -295,7 +295,7 @@ static struct devprobe2 m68k_probes[] __initdata = { * Unified ethernet device probe, segmented per architecture and * per bus interface. This drives the legacy devices only for now. */ - + static void __init ethif_probe2(int unit) { unsigned long base_addr = netdev_boot_base("eth", unit); @@ -349,7 +349,7 @@ static void __init trif_probe2(int unit) } #endif - + /* * The loopback device is global so it can be directly referenced * by the network code. Also, it must be first on device list. @@ -365,7 +365,7 @@ static int __init net_olddevs_init(void) printk(KERN_ERR "Network loopback device setup failed\n"); } - + #ifdef CONFIG_SBNI for (num = 0; num < 8; ++num) sbni_probe(num); |