* deacticate MODULE_SRCVERSION_ALL globally

* merge all CONFIG_MODULE_ options in the global config 
* enable AGP_SIS on amd64
* enable RIO on amd64


svn path=/dists/trunk/linux-2.6/; revision=6800
This commit is contained in:
Frederik Schüler 2006-06-13 15:29:21 +00:00
parent 60cc5fdcff
commit e7571463b1
32 changed files with 8 additions and 94 deletions

View File

@ -8,9 +8,6 @@ CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
# CONFIG_KALLSYMS_ALL is not set
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_ALPHA_GENERIC=y
# CONFIG_ALPHA_ALCOR is not set
# CONFIG_ALPHA_XL is not set

View File

@ -12,9 +12,6 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_EMBEDDED is not set
# CONFIG_KALLSYMS_ALL is not set
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_X86_TSC=y
CONFIG_X86_GOOD_APIC=y
CONFIG_MICROCODE=m
@ -1548,3 +1545,8 @@ CONFIG_PHYSICAL_START=0x200000
CONFIG_HOTPLUG_CPU=y
CONFIG_X86_INTERNODE_CACHE_BYTES=128
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=m
CONFIG_AGP_SIS=m
CONFIG_RIO=m
CONFIG_RIO_OLDPCI=y

View File

@ -17,7 +17,6 @@ CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
# CONFIG_DIGIEPCA is not set
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
CONFIG_ISTALLION=m
CONFIG_FTAPE=m

View File

@ -17,7 +17,6 @@ CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
# CONFIG_DIGIEPCA is not set
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
CONFIG_ISTALLION=m
CONFIG_FTAPE=m

View File

@ -17,7 +17,6 @@ CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
# CONFIG_DIGIEPCA is not set
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
CONFIG_ISTALLION=m
CONFIG_FTAPE=m

View File

@ -18,8 +18,5 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_JBD=y
# CONFIG_ARCH_REALVIEW is not set
CONFIG_TMPFS=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MACLIST is not set
# CONFIG_AEABI is not set

View File

@ -52,7 +52,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
#
CONFIG_MODULES=y
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -46,7 +46,6 @@ CONFIG_BASE_SMALL=0
#
CONFIG_MODULES=y
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -55,11 +55,7 @@ CONFIG_OBSOLETE_INTERMODULE=y
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -50,7 +50,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
#
CONFIG_MODULES=y
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -49,7 +49,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
#
CONFIG_MODULES=y
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -18,8 +18,5 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_JBD=y
# CONFIG_ARCH_REALVIEW is not set
CONFIG_TMPFS=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MACLIST is not set
# CONFIG_AEABI is not set

View File

@ -54,11 +54,7 @@ CONFIG_OBSOLETE_INTERMODULE=y
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

3
debian/arch/config vendored
View File

@ -921,3 +921,6 @@ CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_VIVI=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_MODVERSIONS=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODULE_SRCVERSION_ALL is not set

View File

@ -35,11 +35,7 @@ CONFIG_CC_ALIGN_JUMPS=0
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
# CONFIG_PA7100LC is not set
# CONFIG_PA7200 is not set

View File

@ -6,9 +6,6 @@ CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
CONFIG_EMBEDDED=y
# CONFIG_KALLSYMS_ALL is not set
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set

View File

@ -4,9 +4,6 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_EMBEDDED is not set
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_IA64=y
CONFIG_64BIT=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y

View File

@ -41,11 +41,7 @@ CONFIG_CC_ALIGN_JUMPS=0
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
# CONFIG_ADVANCED is not set
CONFIG_BINFMT_ELF=y

View File

@ -176,11 +176,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -177,11 +177,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -195,11 +195,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y

View File

@ -190,11 +190,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y

View File

@ -177,11 +177,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
#

View File

@ -179,11 +179,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
#

View File

@ -170,11 +170,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
#

View File

@ -195,11 +195,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y

View File

@ -190,11 +190,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y

View File

@ -9,9 +9,6 @@ CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
# CONFIG_KALLSYMS_ALL is not set
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_6xx=y
# CONFIG_40x is not set
# CONFIG_44x is not set

View File

@ -53,11 +53,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#

View File

@ -6,9 +6,6 @@ CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
CONFIG_CPUSETS=y
# CONFIG_EMBEDDED is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_STOP_MACHINE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32

View File

@ -2,9 +2,6 @@ CONFIG_CLEAN_COMPILE=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y

View File

@ -49,11 +49,7 @@ CONFIG_BASE_SMALL=0
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#