Merge HEAD from ../from-linus

diff --combined arch/x86_64/defconfig
index b95c6cf26591f2b339a277088e86c084134ff092,b97a61e1c71ccd0f73a964d3db5cecb647c58a49..bf57e2362bf4cbd79bc9f5e02d7f11b8b18abc0b
--- 1/arch/x86_64/defconfig
--- 2/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.13-rc3
- # Fri Jul 22 16:47:31 2005
+ # Linux kernel version: 2.6.13-rc6-git3
+ # Fri Aug 12 16:40:34 2005
  #
  CONFIG_X86_64=y
  CONFIG_64BIT=y
@@@ -135,6 -135,8 +135,6 @@@ CONFIG_PM_STD_PARTITION="
  # ACPI (Advanced Configuration and Power Interface) Support
  #
  CONFIG_ACPI=y
 -CONFIG_ACPI_BOOT=y
 -CONFIG_ACPI_INTERPRETER=y
  CONFIG_ACPI_AC=y
  CONFIG_ACPI_BATTERY=y
  CONFIG_ACPI_BUTTON=y
@@@ -149,8 -151,10 +149,8 @@@ CONFIG_ACPI_NUMA=
  CONFIG_ACPI_TOSHIBA=y
  CONFIG_ACPI_BLACKLIST_YEAR=2001
  # CONFIG_ACPI_DEBUG is not set
 -CONFIG_ACPI_BUS=y
  CONFIG_ACPI_EC=y
  CONFIG_ACPI_POWER=y
 -CONFIG_ACPI_PCI=y
  CONFIG_ACPI_SYSTEM=y
  # CONFIG_ACPI_CONTAINER is not set
  
@@@ -280,10 -284,6 +280,6 @@@ CONFIG_IPV6=
  # Network testing
  #
  # CONFIG_NET_PKTGEN is not set
- CONFIG_NETPOLL=y
- # CONFIG_NETPOLL_RX is not set
- # CONFIG_NETPOLL_TRAP is not set
- CONFIG_NET_POLL_CONTROLLER=y
  # CONFIG_HAMRADIO is not set
  # CONFIG_IRDA is not set
  # CONFIG_BT is not set
@@@ -459,6 -459,7 +455,7 @@@ CONFIG_AIC79XX_DEBUG_MASK=
  # CONFIG_MEGARAID_NEWGEN is not set
  # CONFIG_MEGARAID_LEGACY is not set
  CONFIG_SCSI_SATA=y
+ # CONFIG_SCSI_SATA_AHCI is not set
  # CONFIG_SCSI_SATA_SVW is not set
  CONFIG_SCSI_ATA_PIIX=y
  # CONFIG_SCSI_SATA_NV is not set
@@@ -488,6 -489,7 +485,7 @@@ CONFIG_SCSI_QLA2XXX=
  # CONFIG_SCSI_QLA2300 is not set
  # CONFIG_SCSI_QLA2322 is not set
  # CONFIG_SCSI_QLA6312 is not set
+ # CONFIG_SCSI_QLA24XX is not set
  # CONFIG_SCSI_LPFC is not set
  # CONFIG_SCSI_DC395x is not set
  # CONFIG_SCSI_DC390T is not set
@@@ -508,9 -510,11 +506,11 @@@ CONFIG_BLK_DEV_DM=
  #
  # Fusion MPT device support
  #
- # CONFIG_FUSION is not set
- # CONFIG_FUSION_SPI is not set
+ CONFIG_FUSION=y
+ CONFIG_FUSION_SPI=y
  # CONFIG_FUSION_FC is not set
+ CONFIG_FUSION_MAX_SGE=128
+ # CONFIG_FUSION_CTL is not set
  
  #
  # IEEE 1394 (FireWire) support
@@@ -581,6 -585,7 +581,7 @@@ CONFIG_8139TOO=
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_E1000=y
+ # CONFIG_E1000_NAPI is not set
  # CONFIG_NS83820 is not set
  # CONFIG_HAMACHI is not set
  # CONFIG_YELLOWFIN is not set
@@@ -620,6 -625,10 +621,10 @@@ CONFIG_S2IO=
  # CONFIG_NET_FC is not set
  # CONFIG_SHAPER is not set
  CONFIG_NETCONSOLE=y
+ CONFIG_NETPOLL=y
+ # CONFIG_NETPOLL_RX is not set
+ # CONFIG_NETPOLL_TRAP is not set
+ CONFIG_NET_POLL_CONTROLLER=y
  
  #
  # ISDN subsystem

diff --combined drivers/serial/Kconfig
index 56de409f486d31dcaa3d659371d1b7ad134b5f7a,d5797618a3b918cc41e89187780d8d641fe49207..b87122a08488c9e0cfe756f399bf2e53527097a5
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -80,7 -80,7 +80,7 @@@ config SERIAL_8250_C
  config SERIAL_8250_ACPI
        bool "8250/16550 device discovery via ACPI namespace"
        default y if IA64
 -      depends on ACPI_BUS && SERIAL_8250
 +      depends on ACPI && SERIAL_8250
        ---help---
          If you wish to enable serial port discovery via the ACPI
          namespace, say Y here.  If unsure, say N.
@@@ -211,7 -211,7 +211,7 @@@ comment "Non-8250 serial port support
  
  config SERIAL_AMBA_PL010
        tristate "ARM AMBA PL010 serial port support"
-       depends on ARM_AMBA
+       depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)
        select SERIAL_CORE
        help
          This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
@@@ -819,7 -819,7 +819,7 @@@ config SERIAL_M32R_SIO_CONSOL
  
  config SERIAL_M32R_PLDSIO
        bool "M32R SIO I/F on a PLD"
-       depends on SERIAL_M32R_SIO=y
+       depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PALT_USRV || PLAT_M32700UT)
        default n
        help
          Say Y here if you want to use the M32R serial controller