From: Ralf Baechle <ralf@linux-mips.org> o Cobalt boxes have a i8159 in their Galileo GT-64011 system controller o Update defconfig Signed-off-by: Andrew Morton <akpm@osdl.org> --- 25-akpm/arch/mips/Kconfig | 1 25-akpm/arch/mips/configs/cobalt_defconfig | 53 ++++++++++++++++++++++++++--- 25-akpm/drivers/pci/pci.ids | 1 3 files changed, 50 insertions(+), 5 deletions(-) diff -puN arch/mips/configs/cobalt_defconfig~mips-cobalt-updates arch/mips/configs/cobalt_defconfig --- 25/arch/mips/configs/cobalt_defconfig~mips-cobalt-updates 2005-01-29 11:26:08.113514480 -0800 +++ 25-akpm/arch/mips/configs/cobalt_defconfig 2005-01-29 11:26:08.121513264 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc2 -# Sun Nov 21 14:11:55 2004 +# Linux kernel version: 2.6.11-rc2 +# Wed Jan 26 02:49:00 2005 # CONFIG_MIPS=y # CONFIG_MIPS64 is not set @@ -26,7 +26,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_HOTPLUG is not set +CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y @@ -79,6 +79,7 @@ CONFIG_MIPS_COBALT=y # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_RBTX4927 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_HAVE_DEC_LOCK=y CONFIG_DMA_NONCOHERENT=y CONFIG_I8259=y @@ -86,7 +87,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_IRQ_CPU=y CONFIG_MIPS_GT64111=y CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_FB is not set # # CPU selection @@ -128,6 +128,20 @@ CONFIG_PCI_NAMES=y CONFIG_MMU=y # +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PC-card bridges +# + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# # Executable file formats # CONFIG_BINFMT_ELF=y @@ -143,6 +157,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y # # Memory Technology Devices (MTD) @@ -166,11 +181,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_INITRAMFS_SOURCE="" # CONFIG_LBD is not set CONFIG_CDROM_PKTCDVD=y @@ -184,6 +201,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_ATA_OVER_ETH=y # # ATA/ATAPI/MFM/RLL support @@ -405,6 +423,7 @@ CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=y # @@ -459,7 +478,6 @@ CONFIG_COBALT_LCD=y # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -490,12 +508,14 @@ CONFIG_COBALT_LCD=y # # Graphics support # +# CONFIG_FB is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -510,11 +530,25 @@ CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# + +# # USB Gadget Support # # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -609,6 +643,11 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS is not set # +# Profiling support +# +# CONFIG_PROFILING is not set + +# # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set @@ -628,6 +667,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_CRYPTO is not set # +# Hardware crypto devices +# + +# # Library routines # # CONFIG_CRC_CCITT is not set diff -puN arch/mips/Kconfig~mips-cobalt-updates arch/mips/Kconfig --- 25/arch/mips/Kconfig~mips-cobalt-updates 2005-01-29 11:26:08.114514328 -0800 +++ 25-akpm/arch/mips/Kconfig 2005-01-29 11:26:08.130511896 -0800 @@ -149,6 +149,7 @@ config MIPS_COBALT depends on EXPERIMENTAL select DMA_NONCOHERENT select HW_HAS_PCI + select I8259 select IRQ_CPU config MACH_DECSTATION diff -puN drivers/pci/pci.ids~mips-cobalt-updates drivers/pci/pci.ids --- 25/drivers/pci/pci.ids~mips-cobalt-updates 2005-01-29 11:26:08.117513872 -0800 +++ 25-akpm/drivers/pci/pci.ids 2005-01-29 11:26:08.128512200 -0800 @@ -4433,6 +4433,7 @@ 11ab Marvell Technology Group Ltd. 0146 GT-64010/64010A System Controller 1fa6 Marvell W8300 802.11 Adapter + 4146 GT-64011/GT-64111 System Controller 4320 Yukon Gigabit Ethernet 10/100/1000Base-T Adapter 4611 GT-64115 System Controller 4620 GT-64120/64120A/64121A System Controller _