From 9f33d034aa625827a1fcf90e502cfe4c6e315384 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 11 Mar 2008 12:56:09 +0000 Subject: [PATCH] sparc: config clean up - kill unrelated config comments makes me cry when i grep through configs sparc config is a real messed up one, and those comments are placed anywhere but near to their real variables (no functional change from aboves) - also no way disabling SCSI_SCAN_ASYNC makes sense, we want that for initramfs and should be real happy about the drivers that support that. svn path=/dists/trunk/linux-2.6/; revision=10781 --- debian/changelog | 1 + debian/config/sparc/config | 100 ------------------------------------- 2 files changed, 1 insertion(+), 100 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6f50ce32..70a08da5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low * postinst: Nuke confusing postinst message. (closes: #465512) * [SECURITY]: Set DEFAULT_MMAP_MIN_ADDR to 65536 enabling low address space protection from user allocation - /proc/sys/vm/mmap_min_addr tunable. + * [sparc]: Enable SCSI_SCAN_ASYNC. [ Martin Michlmayr ] * [arm/armel] Add a kernel for Orion based devices, such as the QNAP diff --git a/debian/config/sparc/config b/debian/config/sparc/config index fa3ad4016..27f91a74e 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -1,7 +1,4 @@ CONFIG_SND_HWDEP=m -# Native Language Support -# Open Sound System -# LED Triggers # CONFIG_FB_S1D13XXX is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set CONFIG_SND_PCM=m @@ -12,7 +9,6 @@ CONFIG_GENERIC_ISA_DMA=y # CONFIG_MMC is not set # CONFIG_OSF_PARTITION is not set CONFIG_SND_OPL3_LIB=m -# Plug and Play support # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_SND_AZT3328 is not set CONFIG_SND_OSSEMUL=y @@ -25,24 +21,19 @@ CONFIG_SUNQE=m # CONFIG_SUN_BPP is not set CONFIG_SND_AC97_CODEC=m # CONFIG_NFS_DIRECTIO is not set -# Console display driver support # CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SERIAL_JSM=m -# SCSI Transport Attributes # CONFIG_SND_HDSP is not set CONFIG_LLC2=m -# Block devices # CONFIG_BLK_CPQ_DA is not set CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_MOUSEDEV_PSAUX=y # CONFIG_IP_PNP_BOOTP is not set -# Telephony Support CONFIG_SND=m CONFIG_SUN_OPENPROMIO=y CONFIG_SUN_MOSTEK_RTC=y # CONFIG_SND_SONICVIBES is not set CONFIG_PPP=m -# Real Time Clock CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_LAPB is not set CONFIG_BLK_DEV_FD=y @@ -58,57 +49,41 @@ CONFIG_CRC_CCITT=m # CONFIG_SCSI_DC390T is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_SND_ES1938 is not set -# Userland interfaces # CONFIG_NCPFS_STRONG is not set -# Misc devices CONFIG_SUN_IO=y # CONFIG_INPUT_EVBUG is not set -# Wireless LAN (non-hamradio) # CONFIG_HP100 is not set -# I2C support # CONFIG_BLK_DEV_UMEM is not set CONFIG_PPP_FILTER=y CONFIG_INPUT=y # CONFIG_IPMI_HANDLER is not set -# RTC interfaces # CONFIG_USB_GADGET is not set # CONFIG_FB_P9100 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_ES1968 is not set -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs # CONFIG_IKCONFIG is not set # CONFIG_SND_VIA82XX_MODEM is not set CONFIG_INPUT_SPARCSPKR=m CONFIG_SERIO_LIBPS2=y # CONFIG_SND_FM801 is not set CONFIG_PLIP=m -# Code maturity level options CONFIG_SERIAL_SUNCORE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_MAC_PARTITION is not set # CONFIG_R3964 is not set -# Queueing/Scheduling -# Cryptographic options CONFIG_SND_MPU401_UART=m # CONFIG_HAMACHI is not set CONFIG_NCPFS_NFS_NS=y -# Serial drivers -# ISDN subsystem # CONFIG_NETPOLL_TRAP is not set # CONFIG_W1 is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_AU8810 is not set -# Kernel hacking CONFIG_SND_TIMER=m CONFIG_SPLIT_PTLOCK_CPUS=4 -# Ethernet (10 or 100Mbit) -# ATA/ATAPI/MFM/RLL support CONFIG_FB_SBUS=y CONFIG_NETCONSOLE=m -# SCSI device support # CONFIG_SND_CS4281 is not set -# Multimedia devices # CONFIG_SND_NM256 is not set CONFIG_UID16=y # CONFIG_HIPPI is not set @@ -119,11 +94,8 @@ CONFIG_LLC=m CONFIG_PPP_MULTILINK=y # CONFIG_HAMRADIO is not set # CONFIG_IPX_INTERN is not set -# LED drivers # CONFIG_SND_RME96 is not set -# CD-ROM/DVD Filesystems # CONFIG_FB_CIRRUS is not set -# USB Gadget Support CONFIG_NET_POLL_CONTROLLER=y # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_MOUSEDEV=y @@ -141,12 +113,10 @@ CONFIG_SOUND=m # CONFIG_SND_BT87X is not set CONFIG_NET_FC=y CONFIG_SCSI_QLOGIC_1280=m -# Digital Video Broadcasting Devices CONFIG_PARPORT_NOT_PC=y # CONFIG_PHONE is not set CONFIG_SND_MIXER_OSS=m # CONFIG_X25 is not set -# Input device support # CONFIG_TR is not set # CONFIG_SND_CA0106 is not set CONFIG_SERIAL_CORE=y @@ -157,48 +127,31 @@ CONFIG_LOGO=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_FB=y # CONFIG_KEYBOARD_XTKBD is not set -# Network device support CONFIG_PPPOE=m -# Device Drivers # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NCPFS_OS2_NS=y -# Miscellaneous filesystems # CONFIG_EFI_PARTITION is not set -# Connector - unified userspace <-> kernelspace linker # CONFIG_RAW_DRIVER is not set -# DOS/FAT/NT Filesystems CONFIG_PRINTER=m -# Graphics support CONFIG_SBUSCHAR=y # CONFIG_SND_YMFPCI is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_ATIIXP is not set CONFIG_SUNLANCE=m CONFIG_SUN_AUXIO=y -# Ethernet (1000 Mbit) # CONFIG_SND_INTEL8X0M is not set # CONFIG_SOUND_PRIME is not set -# Generic devices # CONFIG_SND_ATIIXP_MODEM is not set -# Watchdog Cards # CONFIG_EMBEDDED is not set CONFIG_HAPPYMEAL=m -# Ethernet (10000 Mbit) # CONFIG_FB_NEOMAGIC is not set # CONFIG_SND_VERBOSE_PRINTK is not set CONFIG_PROM_CONSOLE=y -# RTC drivers -# Linux kernel version: 2.6.17 # CONFIG_LP_CONSOLE is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_SUNRPC_GSS=m -# Input Device Drivers -# InfiniBand support # CONFIG_NCPFS_PACKET_SIGNING is not set -# Core Netfilter Configuration -# DCCP CCIDs Configuration (EXPERIMENTAL) # CONFIG_SERIO_PCIPS2 is not set -# Logo configuration CONFIG_INPUT_EVDEV=m # CONFIG_SCSI_IPS is not set # CONFIG_DEV_APPLETALK is not set @@ -207,92 +160,61 @@ CONFIG_IP_PNP=y # CONFIG_SND_TRIDENT is not set # CONFIG_BEFS_DEBUG is not set CONFIG_PCI=y -# Hardware Monitoring support # CONFIG_FB_TILEBLITTING is not set # CONFIG_SND_AU8820 is not set # CONFIG_ISDN is not set -# MMC/SD Card support # CONFIG_SCSI_INIA100 is not set -# SCSI support type (disk, tape, CD-ROM) CONFIG_KEYBOARD_ATKBD=y # CONFIG_SCSI_DEBUG is not set -# ARCnet devices # CONFIG_SND_AU8830 is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_SUN_OPENPROMFS=m -# Sound CONFIG_SLIP_SMART=y # CONFIG_MOUSE_VSXXXAA is not set -# IO Schedulers -# DCCP Configuration (EXPERIMENTAL) # CONFIG_PPDEV is not set -# IPMI -# Hardware crypto devices # CONFIG_SENSORS_F71805F is not set CONFIG_DECNET_ROUTER=y CONFIG_SND_SUN_AMD7930=m # CONFIG_SND_ICE1712 is not set -# Ftape, the floppy tape device driver -# PHY device support # CONFIG_FB_NVIDIA is not set -# Generic Driver Options # CONFIG_SERIO_SERPORT is not set -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) CONFIG_DUMMY=m CONFIG_SCSI_SUNESP=m CONFIG_FB_CG6=y -# Wan interfaces CONFIG_PARPORT_1284=y -# TPM devices -# LED devices -# USB support # CONFIG_SERIO_RAW is not set CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_UINPUT is not set -# SPI Protocol Masters # CONFIG_FONT_SUN12x22 is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 # CONFIG_FB_TRIDENT is not set # CONFIG_IRDA is not set CONFIG_VT_CONSOLE=y -# Library routines CONFIG_JBD=m CONFIG_KEYBOARD_SUNKBD=y CONFIG_NETPOLL=y # CONFIG_GAMEPORT is not set -# Classification # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_FS_MBCACHE=y # CONFIG_WAN_ROUTER is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# Block layer # CONFIG_SND_INTEL8X0 is not set # CONFIG_FB_3DFX is not set -# Non-8250 serial port support -# SCSI low-level drivers -# ALSA Sparc devices -# Token Ring devices -# Multi-device support (RAID and LVM) -# Loadable module support -# Memory Technology Devices (MTD) CONFIG_CRC32=y CONFIG_SUN_PARTITION=y # CONFIG_ATARI_PARTITION is not set # CONFIG_WATCHDOG is not set # CONFIG_UNIXWARE_DISKLABEL is not set CONFIG_SUNBMAC=m -# I2O device support CONFIG_PARPORT=m CONFIG_KEYBOARD_LKKBD=m -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # CONFIG_ACORN_PARTITION is not set # CONFIG_FB_SIS is not set # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_NCPFS_EXTRAS is not set CONFIG_PPP_SYNC_TTY=m CONFIG_SBUS=y -# Hardware I/O ports CONFIG_SPARC=y # CONFIG_SND_DEBUG is not set # CONFIG_R8169 is not set @@ -304,63 +226,41 @@ CONFIG_BNX2=m # CONFIG_DTLK is not set CONFIG_VT=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# Advanced Linux Sound Architecture CONFIG_SND_PCM_OSS=m CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_SND_DUMMY is not set -# Misc Linux/SPARC drivers CONFIG_SERIAL_SUNZILOG_CONSOLE=y -# PCI devices CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_SERIAL_SUNZILOG=y CONFIG_BLK_DEV_NBD=m CONFIG_PPP_DEFLATE=m # CONFIG_IP_PNP_DHCP is not set -# TIPC Configuration (EXPERIMENTAL) # CONFIG_FONTS is not set -# Network testing -# Pseudo filesystems # CONFIG_SND_VIA82XX is not set CONFIG_SERIO_I8042=y # CONFIG_SND_RME9652 is not set CONFIG_EXT2_FS=y # CONFIG_NET_IPGRE is not set -# SPI support # CONFIG_SND_MPU401 is not set -# General setup # CONFIG_FB_KYRO is not set # CONFIG_MINIX_SUBPARTITION is not set -# Tulip family network device support # CONFIG_LDM_PARTITION is not set -# Character devices -# QoS and/or fair queueing -# General machine setup CONFIG_SERIO=y -# Fusion MPT device support # CONFIG_AMIGA_PARTITION is not set -# Parallel port support # CONFIG_SND_ICE1724 is not set CONFIG_HW_CONSOLE=y -# SPI Master Controller Drivers # CONFIG_BSD_DISKLABEL is not set # CONFIG_FB_SAVAGE is not set CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_FB_MATROX is not set -# Partition Types # CONFIG_SND_EMU10K1X is not set -# Security options # CONFIG_APPLICOM is not set CONFIG_FRAMEBUFFER_CONSOLE=y -# Automatically generated make config: don't edit # CONFIG_SOLARIS_X86_PARTITION is not set -# Dallas's 1-wire bus CONFIG_SLIP_COMPRESSED=y # CONFIG_FB_MACMODES is not set # CONFIG_BLK_CPQ_CISS_DA is not set CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_FB_CFB_IMAGEBLIT=y -# Network File Systems # CONFIG_SND_HDA_INTEL is not set -# MII PHY device drivers CONFIG_SCSI_ARCMSR=m -# CONFIG_SCSI_SCAN_ASYNC is not set