[kernel] r10851 - dists/trunk/linux-2.6/debian/config/sparc
Bastian Blank
waldi at alioth.debian.org
Fri Mar 14 13:29:57 UTC 2008
Author: waldi
Date: Fri Mar 14 13:29:55 2008
New Revision: 10851
Log:
debian/config/sparc: Remove silent options.
Modified:
dists/trunk/linux-2.6/debian/config/sparc/config
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Fri Mar 14 13:29:55 2008
@@ -1,13 +1,6 @@
##
## file: arch/sparc/Kconfig
##
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_SPARC=y
-CONFIG_SBUS=y
-CONFIG_SBUSCHAR=y
-CONFIG_SUN_AUXIO=y
-CONFIG_SUN_IO=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_PCI=y
CONFIG_SUN_OPENPROMFS=m
@@ -26,7 +19,6 @@
##
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
@@ -153,9 +145,7 @@
# CONFIG_SLIP_MODE_SLIP6 is not set
CONFIG_NET_FC=y
CONFIG_NETCONSOLE=m
-CONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
##
## file: drivers/net/appletalk/Kconfig
@@ -206,11 +196,8 @@
##
## file: drivers/serial/Kconfig
##
-CONFIG_SERIAL_SUNCORE=y
CONFIG_SERIAL_SUNZILOG=y
CONFIG_SERIAL_SUNZILOG_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
##
@@ -219,12 +206,6 @@
# CONFIG_PHONE is not set
##
-## file: drivers/usb/Kconfig
-##
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-
-##
## file: drivers/usb/gadget/Kconfig
##
# CONFIG_USB_GADGET is not set
@@ -233,8 +214,6 @@
## file: drivers/video/Kconfig
##
CONFIG_FB=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_MACMODES is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_ASILIANT is not set
@@ -264,7 +243,6 @@
## file: drivers/video/console/Kconfig
##
CONFIG_PROM_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FONTS is not set
CONFIG_FONT_SUN8x16=y
@@ -291,9 +269,6 @@
## file: fs/Kconfig
##
CONFIG_EXT2_FS=y
-CONFIG_JBD=m
-CONFIG_FS_MBCACHE=y
-CONFIG_SUNRPC_GSS=m
##
## file: fs/ncpfs/Kconfig
@@ -335,7 +310,6 @@
## choice: Memory model
# CONFIG_DISCONTIGMEM_MANUAL is not set
## end choice
-CONFIG_SPLIT_PTLOCK_CPUS=4
##
## file: net/atm/Kconfig
@@ -397,7 +371,6 @@
##
## file: net/llc/Kconfig
##
-CONFIG_LLC=m
CONFIG_LLC2=m
##
@@ -420,10 +393,6 @@
##
## file: sound/core/Kconfig
##
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -432,9 +401,6 @@
##
## file: sound/drivers/Kconfig
##
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 Fri Mar 14 13:29:55 2008
@@ -6,23 +6,14 @@
##
## file: arch/sparc64/Kconfig
##
-CONFIG_SPARC64=y
-CONFIG_64BIT=y
## choice: Kernel page size
CONFIG_SPARC64_PAGE_SIZE_8KB=y
# CONFIG_SPARC64_PAGE_SIZE_64KB is not set
# CONFIG_SPARC64_PAGE_SIZE_512KB is not set
# CONFIG_SPARC64_PAGE_SIZE_4MB is not set
## end choice
-CONFIG_SYSVIPC_COMPAT=y
# CONFIG_SMP is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_PCI_DOMAINS=y
CONFIG_SPARC32_COMPAT=y
-CONFIG_COMPAT=y
# CONFIG_BINFMT_AOUT32 is not set
CONFIG_SOLARIS_EMUL=m
# CONFIG_CMDLINE_BOOL is not set
@@ -160,11 +151,9 @@
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AEC62XX is not set
CONFIG_BLK_DEV_ALI15X3=m
# CONFIG_WDC_ALI15X3 is not set
@@ -187,8 +176,6 @@
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_BLK_DEV_HD is not set
##
## file: drivers/input/mouse/Kconfig
@@ -205,10 +192,6 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
##
## file: drivers/media/radio/Kconfig
@@ -398,7 +381,6 @@
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set
@@ -476,7 +458,6 @@
##
## file: init/Kconfig
##
-CONFIG_BROKEN_ON_SMP=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_PROFILING is not set
@@ -487,9 +468,6 @@
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_SPARSEMEM_MANUAL=y
## end choice
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
##
## file: sound/core/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Fri Mar 14 13:29:55 2008
@@ -6,24 +6,15 @@
##
## file: arch/sparc64/Kconfig
##
-CONFIG_SPARC64=y
-CONFIG_64BIT=y
## choice: Kernel page size
CONFIG_SPARC64_PAGE_SIZE_8KB=y
# CONFIG_SPARC64_PAGE_SIZE_64KB is not set
# CONFIG_SPARC64_PAGE_SIZE_512KB is not set
# CONFIG_SPARC64_PAGE_SIZE_4MB is not set
## end choice
-CONFIG_SYSVIPC_COMPAT=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_PCI_DOMAINS=y
CONFIG_SPARC32_COMPAT=y
-CONFIG_COMPAT=y
# CONFIG_BINFMT_AOUT32 is not set
CONFIG_SOLARIS_EMUL=m
CONFIG_SCHED_SMT=y
@@ -162,11 +153,9 @@
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AEC62XX is not set
CONFIG_BLK_DEV_ALI15X3=m
# CONFIG_WDC_ALI15X3 is not set
@@ -189,8 +178,6 @@
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_BLK_DEV_HD is not set
##
## file: drivers/input/mouse/Kconfig
@@ -207,10 +194,6 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
##
## file: drivers/media/radio/Kconfig
@@ -400,7 +383,6 @@
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set
@@ -478,10 +460,8 @@
##
## file: init/Kconfig
##
-CONFIG_LOCK_KERNEL=y
CONFIG_LOG_BUF_SHIFT=15
# CONFIG_PROFILING is not set
-CONFIG_STOP_MACHINE=y
##
## file: mm/Kconfig
@@ -490,9 +470,6 @@
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_SPARSEMEM_MANUAL=y
## end choice
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
##
## file: sound/core/Kconfig
More information about the Kernel-svn-changes
mailing list