CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/26 12:35:06

Modified files:
        arch/mips      : Kconfig 
        arch/mips/configs: malta_defconfig 

Log message:
        Fix build of Malta floppy driver.  Lacking a floppy drive within 1m
        distance this is untested but it builds fine ;-)

diff -urN linux/arch/mips/Kconfig linux/arch/mips/Kconfig
--- linux/arch/mips/Kconfig     2005/01/26 02:50:25     1.129
+++ linux/arch/mips/Kconfig     2005/01/26 12:35:06     1.130
@@ -294,6 +294,7 @@
        select BOOT_ELF32
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
+       select GENERIC_ISA_DMA
        select HW_HAS_PCI
        select I8259
        select MIPS_GT64120
diff -urN linux/arch/mips/configs/malta_defconfig 
linux/arch/mips/configs/malta_defconfig
--- linux/arch/mips/configs/malta_defconfig     2005/01/26 02:50:26     1.40
+++ linux/arch/mips/configs/malta_defconfig     2005/01/26 12:35:06     1.41
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11-rc2
-# Wed Jan 26 02:49:06 2005
+# Wed Jan 26 02:53:14 2005
 #
 CONFIG_MIPS=y
 # CONFIG_MIPS64 is not set
@@ -88,6 +88,7 @@
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_DMA_NONCOHERENT=y
+CONFIG_GENERIC_ISA_DMA=y
 CONFIG_I8259=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
@@ -123,7 +124,6 @@
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y