* debian/config/amd64/config, debian/config/i386/config:

Remove empty files.
* debian/config/amd64/defines, debian/config/i386/defines:
  Update config file selection.
* debian/config/kernelarch-x86/config,
  debian/config/kernelarch-x86/config-arch-32,
  debian/config/kernelarch-x86/config-arch-64:
  Merge missing arch specific stuff.

svn path=/dists/trunk/linux-2.6/; revision=14493
This commit is contained in:
Bastian Blank 2009-10-29 10:50:03 +00:00
parent dfeae13097
commit 5424d006b0
7 changed files with 1619 additions and 2630 deletions

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,6 @@ kernel-arch: x86
[image]
configs:
kernelarch-x86/config
amd64/config
suggests: grub | lilo
[amd64_description]

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,6 @@ kernel-arch: x86
[image]
configs:
kernelarch-x86/config
i386/config
suggests: grub | lilo
[486_description]
@ -51,7 +50,6 @@ parts: xen
[amd64_image]
configs:
kernelarch-x86/config-arch-64
amd64/config
amd64/config.amd64
recommends: libc6-i686

File diff suppressed because it is too large Load Diff

View File

@ -77,6 +77,362 @@ CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_TWOFISH_586=m
##
## file: drivers/ata/Kconfig
##
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CS5536 is not set
##
## file: drivers/atm/Kconfig
##
CONFIG_ATM_NICSTAR=m
# CONFIG_ATM_NICSTAR_USE_SUNI is not set
# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
CONFIG_ATM_IA=m
# CONFIG_ATM_IA_DEBUG is not set
##
## file: drivers/auxdisplay/Kconfig
##
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
##
## file: drivers/block/Kconfig
##
CONFIG_BLK_DEV_XD=m
CONFIG_BLK_DEV_RAM_SIZE=8192
##
## file: drivers/block/paride/Kconfig
##
CONFIG_PARIDE_BPCK6=m
##
## file: drivers/char/Kconfig
##
# CONFIG_ESPSERIAL is not set
# CONFIG_ISI is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SPECIALIX is not set
CONFIG_SONYPI=m
CONFIG_SCx200_GPIO=m
CONFIG_CS5535_GPIO=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_ALI=m
CONFIG_AGP_ATI=m
CONFIG_AGP_AMD=m
CONFIG_AGP_AMD64=m
CONFIG_AGP_NVIDIA=m
CONFIG_AGP_SWORKS=m
CONFIG_AGP_EFFICEON=m
##
## file: drivers/crypto/Kconfig
##
CONFIG_CRYPTO_DEV_GEODE=m
##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_SCx200_I2C=m
CONFIG_SCx200_I2C_SCL=12
CONFIG_SCx200_I2C_SDA=13
##
## file: drivers/ide/Kconfig
##
CONFIG_BLK_DEV_CS5535=m
CONFIG_BLK_DEV_CS5536=m
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_ALI14XX is not set
# CONFIG_BLK_DEV_DTC2278 is not set
# CONFIG_BLK_DEV_HT6560B is not set
# CONFIG_BLK_DEV_QD65XX is not set
# CONFIG_BLK_DEV_UMC8672 is not set
##
## file: drivers/input/misc/Kconfig
##
CONFIG_INPUT_WISTRON_BTNS=m
##
## file: drivers/input/mouse/Kconfig
##
# CONFIG_MOUSE_PS2_OLPC is not set
CONFIG_MOUSE_INPORT=m
# CONFIG_MOUSE_ATIXL is not set
CONFIG_MOUSE_LOGIBM=m
CONFIG_MOUSE_PC110PAD=m
##
## file: drivers/isdn/act2000/Kconfig
##
CONFIG_ISDN_DRV_ACT2000=m
##
## file: drivers/isdn/hardware/avm/Kconfig
##
CONFIG_ISDN_DRV_AVMB1_B1ISA=m
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
##
## file: drivers/isdn/hisax/Kconfig
##
CONFIG_HISAX_16_0=y
CONFIG_HISAX_AVM_A1=y
CONFIG_HISAX_IX1MICROR2=y
CONFIG_HISAX_ASUSCOM=y
CONFIG_HISAX_TELEINT=y
CONFIG_HISAX_HFCS=y
CONFIG_HISAX_SPORTSTER=y
CONFIG_HISAX_MIC=y
CONFIG_HISAX_ISURF=y
CONFIG_HISAX_HSTSAPHIR=y
##
## file: drivers/isdn/i4l/Kconfig
##
# CONFIG_ISDN_DIVERSION is not set
##
## file: drivers/isdn/icn/Kconfig
##
CONFIG_ISDN_DRV_ICN=m
##
## file: drivers/isdn/pcbit/Kconfig
##
CONFIG_ISDN_DRV_PCBIT=m
##
## file: drivers/isdn/sc/Kconfig
##
CONFIG_ISDN_DRV_SC=m
##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_WRAP=m
##
## file: drivers/lguest/Kconfig
##
CONFIG_LGUEST=m
##
## file: drivers/macintosh/Kconfig
##
# CONFIG_MACINTOSH_DRIVERS is not set
##
## file: drivers/media/radio/Kconfig
##
CONFIG_RADIO_CADET=m
CONFIG_RADIO_RTRACK=m
CONFIG_RADIO_RTRACK2=m
CONFIG_RADIO_AZTECH=m
CONFIG_RADIO_GEMTEK=m
CONFIG_RADIO_SF16FMI=m
CONFIG_RADIO_SF16FMR2=m
CONFIG_RADIO_TERRATEC=m
CONFIG_RADIO_TRUST=m
CONFIG_RADIO_TYPHOON=m
CONFIG_RADIO_ZOLTRIX=m
##
## file: drivers/mtd/maps/Kconfig
##
CONFIG_MTD_SCx200_DOCFLASH=m
CONFIG_MTD_PCMCIA=m
# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
##
## file: drivers/net/Kconfig
##
CONFIG_EL1=m
CONFIG_EL2=m
CONFIG_ELPLUS=m
CONFIG_EL16=m
CONFIG_EL3=m
CONFIG_3C515=m
CONFIG_LANCE=m
CONFIG_NET_VENDOR_SMC=y
CONFIG_WD80x3=m
CONFIG_ULTRA=m
CONFIG_SMC9194=m
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NI52=m
CONFIG_NI65=m
CONFIG_AT1700=m
CONFIG_DEPCA=m
CONFIG_NET_ISA=y
CONFIG_E2100=m
CONFIG_EWRK3=m
CONFIG_EEXPRESS=m
CONFIG_EEXPRESS_PRO=m
CONFIG_HPLAN_PLUS=m
CONFIG_HPLAN=m
CONFIG_LP486E=m
CONFIG_ETH16I=m
CONFIG_NE2000=m
CONFIG_ZNET=m
CONFIG_SEEQ8005=m
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_CS89x0=m
CONFIG_8139TOO_PIO=y
CONFIG_TLAN=m
##
## file: drivers/net/arcnet/Kconfig
##
CONFIG_ARCNET_COM20020_ISA=m
##
## file: drivers/net/hamradio/Kconfig
##
CONFIG_SCC=m
# CONFIG_SCC_DELAY is not set
# CONFIG_SCC_TRXECHO is not set
##
## file: drivers/net/irda/Kconfig
##
CONFIG_TOSHIBA_FIR=m
##
## file: drivers/net/wan/Kconfig
##
CONFIG_HOSTESS_SV11=m
CONFIG_COSA=m
CONFIG_SEALEVEL_4021=m
CONFIG_N2=m
CONFIG_C101=m
CONFIG_SDLA=m
##
## file: drivers/net/wireless/Kconfig
##
CONFIG_ARLAN=m
CONFIG_WAVELAN=m
##
## file: drivers/net/wireless/ipw2x00/Kconfig
##
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
##
## file: drivers/pci/hotplug/Kconfig
##
CONFIG_HOTPLUG_PCI_COMPAQ=m
CONFIG_HOTPLUG_PCI_IBM=m
##
## file: drivers/pcmcia/Kconfig
##
CONFIG_I82365=m
##
## file: drivers/platform/x86/Kconfig
##
CONFIG_TC1100_WMI=m
##
## file: drivers/pnp/isapnp/Kconfig
##
CONFIG_ISAPNP=y
##
## file: drivers/pnp/pnpbios/Kconfig
##
CONFIG_PNPBIOS=y
CONFIG_PNPBIOS_PROC_FS=y
##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_IN2000=m
# CONFIG_SCSI_FLASHPOINT is not set
CONFIG_SCSI_DTC3280=m
CONFIG_SCSI_EATA_PIO=m
# CONFIG_SCSI_GENERIC_NCR5380 is not set
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_GENERIC_NCR53C400 is not set
# CONFIG_SCSI_INIA100 is not set
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_PAS16=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_SYM53C416=m
CONFIG_SCSI_T128=m
CONFIG_SCSI_U14_34F=m
CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
CONFIG_SCSI_U14_34F_MAX_TAGS=8
CONFIG_SCSI_ULTRASTOR=m
CONFIG_SCSI_NSP32=m
##
## file: drivers/scsi/pcmcia/Kconfig
##
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_NINJA_SCSI=m
##
## file: drivers/serial/Kconfig
##
CONFIG_SERIAL_8250_EXAR_ST16C554=m
##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
##
## file: drivers/video/Kconfig
##
CONFIG_FB_NVIDIA_I2C=y
CONFIG_FB_I810=m
# CONFIG_FB_I810_GTF is not set
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_MAVEN=m
CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_SAVAGE_I2C=y
##
## file: drivers/video/console/Kconfig
##
CONFIG_MDA_CONSOLE=m
##
## file: drivers/video/geode/Kconfig
##
CONFIG_FB_GEODE=y
CONFIG_FB_GEODE_LX=m
CONFIG_FB_GEODE_GX=m
CONFIG_FB_GEODE_GX1=m
##
## file: drivers/watchdog/Kconfig
##
CONFIG_SCx200_WDT=m
CONFIG_SBC7240_WDT=m
CONFIG_PCWATCHDOG=m
CONFIG_MIXCOMWD=m
CONFIG_WDT=m
##
## file: fs/Kconfig.binfmt
##
CONFIG_BINFMT_AOUT=m
##
## file: lib/Kconfig.debug
##
@ -96,9 +452,51 @@ CONFIG_FLATMEM_MANUAL=y
##
CONFIG_LSM_MMAP_MIN_ADDR=0
##
## file: sound/isa/Kconfig
##
CONFIG_SND_ISA=y
CONFIG_SND_ADLIB=m
CONFIG_SND_AD1816A=m
CONFIG_SND_AD1848=m
CONFIG_SND_ALS100=m
CONFIG_SND_AZT2320=m
CONFIG_SND_CMI8330=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4236=m
CONFIG_SND_DT019X=m
CONFIG_SND_ES968=m
CONFIG_SND_ES1688=m
CONFIG_SND_ES18XX=m
CONFIG_SND_SC6000=m
CONFIG_SND_GUSCLASSIC=m
CONFIG_SND_GUSEXTREME=m
CONFIG_SND_GUSMAX=m
CONFIG_SND_INTERWAVE=m
CONFIG_SND_INTERWAVE_STB=m
CONFIG_SND_OPL3SA2=m
CONFIG_SND_OPTI92X_AD1848=m
CONFIG_SND_OPTI92X_CS4231=m
CONFIG_SND_OPTI93X=m
CONFIG_SND_MIRO=m
CONFIG_SND_SB8=m
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
CONFIG_SND_SGALAXY=m
CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m
##
## file: sound/pci/Kconfig
##
CONFIG_SND_CS5535AUDIO=m
CONFIG_SND_SIS7019=m
##
## file: unknown
##
CONFIG_RADIO_TYPHOON_PROC_FS=y
CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y

View File

@ -43,6 +43,87 @@ CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
##
## file: drivers/block/Kconfig
##
CONFIG_BLK_DEV_RAM_SIZE=65536
##
## file: drivers/char/Kconfig
##
CONFIG_MOXA_INTELLIO=m
CONFIG_ISI=m
CONFIG_SPECIALIX=m
CONFIG_RIO=m
CONFIG_RIO_OLDPCI=y
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=y
CONFIG_AGP_AMD64=y
##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_I2C_STUB=m
##
## file: drivers/ide/Kconfig
##
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
##
## file: drivers/input/mouse/Kconfig
##
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
##
## file: drivers/isdn/i4l/Kconfig
##
CONFIG_ISDN_DIVERSION=m
##
## file: drivers/macintosh/Kconfig
##
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
##
## file: drivers/net/Kconfig
##
# CONFIG_8139TOO_PIO is not set
##
## file: drivers/net/wireless/ipw2x00/Kconfig
##
# CONFIG_IPW2100 is not set
##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_INIA100=m
##
## file: drivers/usb/Kconfig
##
CONFIG_USB=y
##
## file: drivers/video/Kconfig
##
# CONFIG_FB_NVIDIA_I2C is not set
# CONFIG_FB_ATY_GENERIC_LCD is not set
# CONFIG_FB_SAVAGE_I2C is not set
##
## file: drivers/video/geode/Kconfig
##
# CONFIG_FB_GEODE is not set
##
## file: init/Kconfig
##