Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 8 insertions, 7 deletions

diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index bba650312fd9..a9fb83a8c180 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -41,11 +41,12 @@
 #endif
 
 unsigned long m68k_machtype;
-unsigned long m68k_cputype;
 EXPORT_SYMBOL(m68k_machtype);
+unsigned long m68k_cputype;
 EXPORT_SYMBOL(m68k_cputype);
 unsigned long m68k_fputype;
 unsigned long m68k_mmutype;
+EXPORT_SYMBOL(m68k_mmutype);
 #ifdef CONFIG_VME
 unsigned long vme_brdtype;
 EXPORT_SYMBOL(vme_brdtype);
@@ -345,19 +346,19 @@ void __init setup_arch(char **cmdline_p)
 
 /* set ISA defs early as possible */
 #if defined(CONFIG_ISA) && defined(MULTI_ISA)
-#if defined(CONFIG_Q40)
         if (MACH_IS_Q40) {
-                isa_type = Q40_ISA;
+                isa_type = ISA_TYPE_Q40;
                 isa_sex = 0;
         }
-#elif defined(CONFIG_GG2)
+#ifdef CONFIG_GG2
         if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {
-                isa_type = GG2_ISA;
+                isa_type = ISA_TYPE_GG2;
                 isa_sex = 0;
         }
-#elif defined(CONFIG_AMIGA_PCMCIA)
+#endif
+#ifdef CONFIG_AMIGA_PCMCIA
         if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {
-                isa_type = AG_ISA;
+                isa_type = ISA_TYPE_AG;
                 isa_sex = 1;
         }
 #endif