From: Ralf Baechle o Cleanup lock definitions o Fix config.h use o Update defconfig Signed-off-by: Andrew Morton --- 25-akpm/arch/mips/configs/osprey_defconfig | 50 ++++++++++++++++++++++++++--- 25-akpm/arch/mips/vr4181/common/irq.c | 2 - 25-akpm/arch/mips/vr4181/common/time.c | 2 - 25-akpm/arch/mips/vr4181/osprey/setup.c | 2 - 4 files changed, 49 insertions(+), 7 deletions(-) diff -puN arch/mips/configs/osprey_defconfig~mips-vr4181-updates arch/mips/configs/osprey_defconfig --- 25/arch/mips/configs/osprey_defconfig~mips-vr4181-updates 2005-01-29 11:26:10.111210784 -0800 +++ 25-akpm/arch/mips/configs/osprey_defconfig 2005-01-29 11:26:10.119209568 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc2 -# Sun Nov 21 14:12:04 2004 +# Linux kernel version: 2.6.11-rc2 +# Wed Jan 26 02:49:08 2005 # CONFIG_MIPS=y # CONFIG_MIPS64 is not set @@ -85,12 +85,12 @@ CONFIG_NEC_OSPREY=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_CPU_LITTLE_ENDIAN=y CONFIG_IRQ_CPU=y CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_FB is not set CONFIG_VR4181=y # @@ -127,6 +127,19 @@ CONFIG_CPU_HAS_SYNC=y CONFIG_MMU=y # +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PC-card bridges +# + +# +# PCI Hotplug Support +# + +# # Executable file formats # CONFIG_BINFMT_ELF=y @@ -142,6 +155,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set # # Memory Technology Devices (MTD) @@ -161,9 +175,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD 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=m @@ -177,6 +193,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support @@ -347,6 +364,7 @@ CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=m # @@ -400,7 +418,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -431,12 +448,14 @@ CONFIG_LEGACY_PTY_COUNT=256 # # 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 @@ -450,11 +469,25 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_OHCI is not set # +# 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 @@ -548,6 +581,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 @@ -567,6 +605,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/vr4181/common/irq.c~mips-vr4181-updates arch/mips/vr4181/common/irq.c --- 25/arch/mips/vr4181/common/irq.c~mips-vr4181-updates 2005-01-29 11:26:10.113210480 -0800 +++ 25-akpm/arch/mips/vr4181/common/irq.c 2005-01-29 11:26:10.120209416 -0800 @@ -1,6 +1,7 @@ /* * Copyright (C) 2001 MontaVista Software Inc. * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net + * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) * * linux/arch/mips/vr4181/common/irq.c * Completely re-written to use the new irq.c @@ -12,7 +13,6 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ -#include #include #include #include diff -puN arch/mips/vr4181/common/time.c~mips-vr4181-updates arch/mips/vr4181/common/time.c --- 25/arch/mips/vr4181/common/time.c~mips-vr4181-updates 2005-01-29 11:26:10.114210328 -0800 +++ 25-akpm/arch/mips/vr4181/common/time.c 2005-01-29 11:26:10.120209416 -0800 @@ -29,7 +29,7 @@ * RTC ops */ -spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(rtc_lock); /* per VR41xx docs, bad data can be read if between 2 counts */ static inline unsigned short diff -puN arch/mips/vr4181/osprey/setup.c~mips-vr4181-updates arch/mips/vr4181/osprey/setup.c --- 25/arch/mips/vr4181/osprey/setup.c~mips-vr4181-updates 2005-01-29 11:26:10.115210176 -0800 +++ 25-akpm/arch/mips/vr4181/osprey/setup.c 2005-01-29 11:26:10.121209264 -0800 @@ -8,6 +8,7 @@ * * Copyright 2001 MontaVista Software Inc. * Author: jsun@mvista.com or jsun@junsun.net + * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -15,7 +16,6 @@ * */ -#include #include #include #include _