Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
  MIPS: Alchemy: defconfig updates
  MIPS: Alchemy: Fix Au1100 ethernet build failure
  MIPS: Alchemy: Repair db1500/bosporus builds
  MIPS: ARC: Cleanup unused definitions from sgialib.h
  MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
  MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
  MIPS: Cobalt: Fix theoretical port aliasing issue
  MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
  MIPS: Crazy spinlock speed test.
  MIPS: Optimize spinlocks.
  MIPS: Alchemy: devboard PM needs to save CPLD registers.
  MIPS: PowerTV: Eliminate duplicate opcode definition macros
  MIPS: Lemote 2F: Move printks out of port_access_lock.
  MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
  MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
  MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
  MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
  MIPS: Loongson: Remove pointless sample_lock from oprofile code.
  MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
  MIPS: i8259: Convert IRQ controller lock to raw spinlock.
  ...

diff --combined drivers/pcmcia/Kconfig
index e8f35dac2d51e7c657245e3bfcc15dd204efd8bd,1e01578a0a77cc9bf1bcb5de81041a93dd907993..0a6601c76809bb90c041742c5f8ba437f9be6814
--- 1/drivers/pcmcia/Kconfig
--- 2/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@@ -84,7 -84,7 +84,7 @@@ config YENT
        tristate "CardBus yenta-compatible bridge support"
        depends on PCI
        select CARDBUS if !EMBEDDED
 -      select PCCARD_NONSTATIC
 +      select PCCARD_NONSTATIC if PCMCIA != n
        ---help---
          This option enables support for CardBus host bridges.  Virtually
          all modern PCMCIA bridges are CardBus compatible.  A "bridge" is
@@@ -161,8 -161,9 +161,8 @@@ config TCI
  
  config PCMCIA_M8XX
        tristate "MPC8xx PCMCIA support"
 -      depends on PCMCIA && PPC && 8xx
 -      select PCCARD_IODYN
 -      select PCCARD_NONSTATIC
 +      depends on PCCARD && PPC && 8xx
 +      select PCCARD_IODYN if PCMCIA != n
        help
          Say Y here to include support for PowerPC 8xx series PCMCIA
          controller.
@@@ -173,6 -174,27 +173,27 @@@ config PCMCIA_AU1X0
        tristate "Au1x00 pcmcia support"
        depends on SOC_AU1X00 && PCMCIA
  
+ config PCMCIA_ALCHEMY_DEVBOARD
+       tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
+       depends on SOC_AU1X00 && PCMCIA
+       select 64BIT_PHYS_ADDR
+       help
+         Enable this driver of you want PCMCIA support on your Alchemy
+         Db1000, Db/Pb1100, Db/Pb1500, Db/Pb1550, Db/Pb1200 board.
+         NOT suitable for the PB1000!
+ 
+         This driver is also available as a module called db1xxx_ss.ko
+ 
+ config PCMCIA_XXS1500
+       tristate "MyCable XXS1500 PCMCIA socket support"
+       depends on PCMCIA && MIPS_XXS1500
+       select 64BIT_PHYS_ADDR
+       help
+         Support for the PCMCIA/CF socket interface on MyCable XXS1500
+         systems.
+ 
+         This driver is also available as a module called xxs1500_ss.ko
+ 
  config PCMCIA_BCM63XX
        tristate "bcm63xx pcmcia support"
        depends on BCM63XX && PCMCIA
@@@ -237,12 -259,14 +258,12 @@@ config PCMCIA_PROB
  config M32R_PCC
        bool "M32R PCMCIA I/F"
        depends on M32R && CHIP_M32700 && PCMCIA
 -      select PCCARD_NONSTATIC
        help
          Say Y here to use the M32R PCMCIA controller.
  
  config M32R_CFC
        bool "M32R CF I/F Controller"
        depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
 -      select PCCARD_NONSTATIC
        help
          Say Y here to use the M32R CompactFlash controller.
  

diff --combined drivers/pcmcia/Makefile
index 3c83f68c803a357562cca15a3c36ed00ec15d758,21ee96448b1e76e042f4b63f14ce38abbbab6c88..381b031d9d7539ad3bc10d4a9091069a689e82e3
--- 1/drivers/pcmcia/Makefile
--- 2/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -2,11 -2,11 +2,11 @@@
  # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
  #
  
 -pcmcia_core-y                                 += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o
 +pcmcia_core-y                                 += cs.o rsrc_mgr.o socket_sysfs.o
  pcmcia_core-$(CONFIG_CARDBUS)                 += cardbus.o
  obj-$(CONFIG_PCCARD)                          += pcmcia_core.o
  
 -pcmcia-y                                      += ds.o pcmcia_resource.o
 +pcmcia-y                                      += ds.o pcmcia_resource.o cistpl.o
  pcmcia-$(CONFIG_PCMCIA_IOCTL)                 += pcmcia_ioctl.o
  obj-$(CONFIG_PCMCIA)                          += pcmcia.o
  
@@@ -35,18 -35,10 +35,10 @@@ obj-$(CONFIG_OMAP_CF)                              += omap_cf.
  obj-$(CONFIG_BFIN_CFPCMCIA)                   += bfin_cf_pcmcia.o
  obj-$(CONFIG_AT91_CF)                         += at91_cf.o
  obj-$(CONFIG_ELECTRA_CF)                      += electra_cf.o
+ obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD)         += db1xxx_ss.o
  
  au1x00_ss-y                                   += au1000_generic.o
  au1x00_ss-$(CONFIG_MIPS_PB1000)                       += au1000_pb1x00.o
- au1x00_ss-$(CONFIG_MIPS_PB1100)                       += au1000_pb1x00.o
- au1x00_ss-$(CONFIG_MIPS_PB1200)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_PB1500)                       += au1000_pb1x00.o
- au1x00_ss-$(CONFIG_MIPS_DB1000)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_DB1100)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_DB1200)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_DB1500)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_DB1550)                       += au1000_db1x00.o
- au1x00_ss-$(CONFIG_MIPS_XXS1500)              += au1000_xxs1500.o
  
  sa1111_cs-y                                   += sa1111_generic.o
  sa1111_cs-$(CONFIG_ASSABET_NEPONSET)          += sa1100_neponset.o
@@@ -76,3 -68,5 +68,5 @@@ pxa2xx-obj-$(CONFIG_MACH_E740)                        += pxa
  pxa2xx-obj-$(CONFIG_MACH_STARGATE2)           += pxa2xx_stargate2.o
  
  obj-$(CONFIG_PCMCIA_PXA2XX)                   += pxa2xx_base.o $(pxa2xx-obj-y)
+ 
+ obj-$(CONFIG_PCMCIA_XXS1500)                  += xxs1500_ss.o