Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

11 files changed, 37 insertions, 37 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 696f72787fe8..84e68cdd451b 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -687,7 +687,7 @@ config NVRAM
 
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC32 && !PARISC && !IA64 && !M68K && (!(SPARC32 || SPARC64) || PCI)
+        depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI)
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC32 && !SPARC64
+        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 449d029ad4f4..8b603b2d1c42 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -930,8 +930,8 @@ static void kbd_refresh_leds(struct input_handle *handle)
 }
 
 #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
-    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\
-    defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
+    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
+    defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
     (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC))
 
 #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
@@ -958,7 +958,7 @@ static unsigned short x86_keycodes[256] =
 extern int mac_hid_mouse_emulate_buttons(int, int, int);
 #endif /* CONFIG_MAC_EMUMOUSEBTN */
 
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
 static int sparc_l1_a_state = 0;
 extern void sun_do_break(void);
 #endif
@@ -1045,7 +1045,7 @@ static void kbd_keycode(unsigned int keycode, int down,
 
         if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)
                 sysrq_alt = down;
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
         if (keycode == KEY_STOP)
                 sparc_l1_a_state = down;
 #endif
@@ -1072,7 +1072,7 @@ static void kbd_keycode(unsigned int keycode, int down,
                 return;
         }
 #endif
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
         if (keycode == KEY_A && sparc_l1_a_state) {
                 sparc_l1_a_state = 0;
                 sun_do_break();
diff --git a/drivers/fc4/Kconfig b/drivers/fc4/Kconfig
index f00c02a13ed6..345dbe6f10df 100644
--- a/drivers/fc4/Kconfig
+++ b/drivers/fc4/Kconfig
@@ -26,7 +26,7 @@ comment "FC4 drivers"
 
 config FC4_SOC
         tristate "Sun SOC/Sbus"
-        depends on FC4!=n && (SPARC32 || SPARC64)
+        depends on FC4!=n && SPARC
         help
           Serial Optical Channel is an interface card with one or two Fibre
           Optic ports, each of which can be connected to a disk array. Note
@@ -38,7 +38,7 @@ config FC4_SOC
 
 config FC4_SOCAL
         tristate "Sun SOC+ (aka SOCAL)"
-        depends on FC4!=n && (SPARC32 || SPARC64)
+        depends on FC4!=n && SPARC
         ---help---
           Serial Optical Channel Plus is an interface card with up to two
           Fibre Optic ports. This card supports FC Arbitrated Loop (usually
@@ -62,7 +62,7 @@ config SCSI_PLUTO
           be called pluto.
 
 config SCSI_FCAL
-        tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC32 || SPARC64
+        tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC
         depends on FC4!=n && SCSI
         help
           This driver drives FC-AL disks connected through a Fibre Channel
@@ -75,7 +75,7 @@ config SCSI_FCAL
 
 config SCSI_FCAL
         prompt "Generic FC-AL disk driver"
-        depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
+        depends on FC4!=n && SCSI && !SPARC
 
 endmenu
 
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 07813fc0523f..e08dbe08f46d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -26,7 +26,7 @@ config INPUT_PCSPKR
 
 config INPUT_SPARCSPKR
         tristate "SPARC Speaker support"
-        depends on PCI && (SPARC32 || SPARC64)
+        depends on PCI && SPARC
         help
           Say Y here if you want the standard Speaker on Sparc PCI systems
           to be used for bells and whistles.
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 13835039a2a7..cbbf3842da5b 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -21,7 +21,7 @@
 #include "i8042-ip22io.h"
 #elif defined(CONFIG_PPC)
 #include "i8042-ppcio.h"
-#elif defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#elif defined(CONFIG_SPARC)
 #include "i8042-sparcio.h"
 #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
 #include "i8042-x86ia64io.h"
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 452ccd5037c3..b9b77cf39a18 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -62,7 +62,7 @@ config MTD_PHYSMAP_BANKWIDTH
 
 config MTD_SUN_UFLASH
         tristate "Sun Microsystems userflash support"
-        depends on (SPARC32 || SPARC64) && MTD_CFI
+        depends on SPARC && MTD_CFI
         help
           This provides a 'mapping' driver which supports the way in
           which user-programmable flash chips are connected on various
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 081717d01374..28ce47a02408 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2907,7 +2907,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
         return 0;
 }
 
-static void __devexit gem_remove_one(struct pci_dev *pdev)
+static void gem_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -3181,7 +3181,7 @@ static struct pci_driver gem_driver = {
         .name           = GEM_MODULE_NAME,
         .id_table       = gem_pci_tbl,
         .probe          = gem_init_one,
-        .remove         = __devexit_p(gem_remove_one),
+        .remove         = gem_remove_one,
 #ifdef CONFIG_PM
         .suspend        = gem_suspend,
         .resume         = gem_resume,
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ad47c1b84c3f..812bae62c8ec 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -10,7 +10,7 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
         tristate "8250/16550 and compatible serial support"
-        depends on (BROKEN || !(SPARC64 || SPARC32))
+        depends on (BROKEN || !SPARC)
         select SERIAL_CORE
         ---help---
           This selects whether you want to include the driver for the standard
@@ -469,14 +469,14 @@ config SERIAL_IMX_CONSOLE
 
 config SERIAL_SUNCORE
         bool
-        depends on SPARC32 || SPARC64
+        depends on SPARC
         select SERIAL_CORE
         select SERIAL_CORE_CONSOLE
         default y
 
 config SERIAL_SUNZILOG
         tristate "Sun Zilog8530 serial support"
-        depends on SPARC32 || SPARC64
+        depends on SPARC
         help
           This driver supports the Zilog8530 serial ports found on many Sparc
           systems.  Say Y or M if you want to be able to these serial ports.
@@ -491,7 +491,7 @@ config SERIAL_SUNZILOG_CONSOLE
 
 config SERIAL_SUNSU
         tristate "Sun SU serial support"
-        depends on (SPARC32 || SPARC64) && PCI
+        depends on SPARC && PCI
         help
           This driver supports the 8250 serial ports that run the keyboard and
           mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able
@@ -547,7 +547,7 @@ config PDC_CONSOLE
 
 config SERIAL_SUNSAB
         tristate "Sun Siemens SAB82532 serial support"
-        depends on (SPARC32 || SPARC64) && PCI
+        depends on SPARC && PCI
         help
           This driver supports the Siemens SAB82532 DUSCC serial ports on newer
           (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3e470c8b4193..cc8e3bf5001b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -536,13 +536,13 @@ config FB_SUN3
 
 config FB_SBUS
         bool "SBUS and UPA framebuffers"
-        depends on (FB = y) && (SPARC32 || SPARC64)
+        depends on (FB = y) && SPARC
         help
           Say Y if you want support for SBUS or UPA based frame buffer device.
 
 config FB_BW2
         bool "BWtwo support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -551,7 +551,7 @@ config FB_BW2
 
 config FB_CG3
         bool "CGthree support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -560,7 +560,7 @@ config FB_CG3
 
 config FB_CG6
         bool "CGsix (GX,TurboGX) support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
@@ -1268,7 +1268,7 @@ config FB_LEO
 
 config FB_PCI
         bool "PCI framebuffers"
-        depends on (FB = y) && PCI && (SPARC64 || SPARC32)
+        depends on (FB = y) && PCI && SPARC
 
 config FB_IGA
         bool "IGA 168x display support"
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5f74df993406..a5d09e159cd1 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
         bool "VGA text console" if EMBEDDED || !X86
-        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC && !ARCH_VERSATILE
+        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !ARCH_VERSATILE
         default y
         help
           Saying Y here will allow you to use Linux in text mode through a
@@ -68,7 +68,7 @@ config SGI_NEWPORT_CONSOLE
 
 config PROM_CONSOLE
         bool "PROM console"
-        depends on SPARC32 || SPARC64
+        depends on SPARC
         help
           Say Y to build a console driver for Sun machines that uses the
           terminal emulation built into their console PROMS.
@@ -136,7 +136,7 @@ config FONTS
 config FONT_8x8
         bool "VGA 8x8 font" if FONTS
         depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS
+        default y if !SPARC && !FONTS
         help
           This is the "high resolution" font for the VGA frame buffer (the one
           provided by the text console 80x50 (and higher) modes).
@@ -150,7 +150,7 @@ config FONT_8x8
 config FONT_8x16
         bool "VGA 8x16 font" if FONTS
         depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
-        default y if !SPARC32 && !SPARC64 && !FONTS
+        default y if !SPARC && !FONTS
         help
           This is the "high resolution" font for the VGA frame buffer (the one
           provided by the VGA text console 80x25 mode.
@@ -160,7 +160,7 @@ config FONT_8x16
 config FONT_6x11
         bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
         depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && MAC
+        default y if !SPARC && !FONTS && MAC
         help
           Small console font with Macintosh-style high-half glyphs.  Some Mac
           framebuffer drivers don't support this one at all.
@@ -176,7 +176,7 @@ config FONT_7x14
 config FONT_PEARL_8x8
         bool "Pearl (old m68k) console 8x8 font" if FONTS
         depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && AMIGA
+        default y if !SPARC && !FONTS && AMIGA
         help
           Small console font with PC-style control-character and high-half
           glyphs.
@@ -184,24 +184,24 @@ config FONT_PEARL_8x8
 config FONT_ACORN_8x8
         bool "Acorn console 8x8 font" if FONTS
         depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && ARM && ARCH_ACORN
+        default y if !SPARC && !FONTS && ARM && ARCH_ACORN
         help
           Small console font with PC-style control characters and high-half
           glyphs.
 
 config FONT_MINI_4x6
         bool "Mini 4x6 font"
-        depends on !SPARC32 && !SPARC64 && FONTS
+        depends on !SPARC && FONTS
 
 config FONT_SUN8x16
         bool "Sparc console 8x16 font"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
         help
           This is the high resolution console font for Sun machines. Say Y.
 
 config FONT_SUN12x22
         bool "Sparc console 12x22 font (not supported by all drivers)"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
         help
           This is the high resolution console font for Sun machines with very
           big letters (like the letters used in the SPARC PROM). If the
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 8cb7fb4db441..f0e6512c87ff 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -47,7 +47,7 @@ config LOGO_SGI_CLUT224
 
 config LOGO_SUN_CLUT224
         bool "224-color Sun Linux logo"
-        depends on LOGO && (SPARC32 || SPARC64)
+        depends on LOGO && SPARC
         default y
 
 config LOGO_SUPERH_MONO