Commit 25b37ef6 authored by Linus Torvalds's avatar Linus Torvalds

Import 2.3.99pre3

parent d815bef3
This diff is collapsed.
This diff is collapsed.
...@@ -1133,6 +1133,13 @@ L: linux-usb@suse.com ...@@ -1133,6 +1133,13 @@ L: linux-usb@suse.com
S: Maintained S: Maintained
W: http://www.kroah.com/linux-usb/ W: http://www.kroah.com/linux-usb/
USB MASS STORAGE DRIVER
P: Matthew Dharm
M: mdharm-usb@one-eyed-alien.net
L: linux-usb@suse.com
S: Maintained
W: http://www.one-eyed-alien.net/~mdharm/linux-usb/
USB UHCI DRIVER USB UHCI DRIVER
P: Georg Acher P: Georg Acher
M: usb@in.tum.de M: usb@in.tum.de
......
...@@ -55,7 +55,7 @@ choice 'Alpha system type' \ ...@@ -55,7 +55,7 @@ choice 'Alpha system type' \
# clear all implied options (don't want default values for those): # clear all implied options (don't want default values for those):
unset CONFIG_ALPHA_EV4 CONFIG_ALPHA_EV5 CONFIG_ALPHA_EV6 unset CONFIG_ALPHA_EV4 CONFIG_ALPHA_EV5 CONFIG_ALPHA_EV6
unset CONFIG_PCI CONFIG_ISA CONFIG_ALPHA_EISA unset CONFIG_ALPHA_EISA
unset CONFIG_ALPHA_LCA CONFIG_ALPHA_APECS CONFIG_ALPHA_CIA unset CONFIG_ALPHA_LCA CONFIG_ALPHA_APECS CONFIG_ALPHA_CIA
unset CONFIG_ALPHA_T2 CONFIG_ALPHA_PYXIS CONFIG_ALPHA_POLARIS unset CONFIG_ALPHA_T2 CONFIG_ALPHA_PYXIS CONFIG_ALPHA_POLARIS
unset CONFIG_ALPHA_TSUNAMI CONFIG_ALPHA_MCPCIA unset CONFIG_ALPHA_TSUNAMI CONFIG_ALPHA_MCPCIA
...@@ -66,10 +66,13 @@ unset CONFIG_ALPHA_BROKEN_IRQ_MASK ...@@ -66,10 +66,13 @@ unset CONFIG_ALPHA_BROKEN_IRQ_MASK
# and this doesn't activate hordes of code, so do it always. # and this doesn't activate hordes of code, so do it always.
define_bool CONFIG_ISA y define_bool CONFIG_ISA y
if [ "$CONFIG_ALPHA_GENERIC" = "y" ] if [ "$CONFIG_ALPHA_JENSEN" = "y" ]
then then
define_bool CONFIG_PCI n
else
define_bool CONFIG_PCI y define_bool CONFIG_PCI y
fi fi
if [ "$CONFIG_ALPHA_BOOK1" = "y" ] if [ "$CONFIG_ALPHA_BOOK1" = "y" ]
then then
define_bool CONFIG_ALPHA_NONAME y define_bool CONFIG_ALPHA_NONAME y
...@@ -77,22 +80,18 @@ fi ...@@ -77,22 +80,18 @@ fi
if [ "$CONFIG_ALPHA_NONAME" = "y" -o "$CONFIG_ALPHA_EB66" = "y" \ if [ "$CONFIG_ALPHA_NONAME" = "y" -o "$CONFIG_ALPHA_EB66" = "y" \
-o "$CONFIG_ALPHA_EB66P" = "y" -o "$CONFIG_ALPHA_P2K" = "y" ] -o "$CONFIG_ALPHA_EB66P" = "y" -o "$CONFIG_ALPHA_P2K" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_EV4 y
define_bool CONFIG_ALPHA_LCA y define_bool CONFIG_ALPHA_LCA y
fi fi
if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI" = "y" \ if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI" = "y" \
-o "$CONFIG_ALPHA_EB64P" = "y" -o "$CONFIG_ALPHA_XL" = "y" ] -o "$CONFIG_ALPHA_EB64P" = "y" -o "$CONFIG_ALPHA_XL" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_EV4 y
define_bool CONFIG_ALPHA_APECS y define_bool CONFIG_ALPHA_APECS y
fi fi
if [ "$CONFIG_ALPHA_EB164" = "y" -o "$CONFIG_ALPHA_PC164" = "y" \ if [ "$CONFIG_ALPHA_EB164" = "y" -o "$CONFIG_ALPHA_PC164" = "y" \
-o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_XLT" = "y" \ -o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_TAKARA" = "y" ]
-o "$CONFIG_ALPHA_TAKARA" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_CIA y define_bool CONFIG_ALPHA_CIA y
fi fi
...@@ -107,11 +106,9 @@ then ...@@ -107,11 +106,9 @@ then
define_bool CONFIG_ALPHA_EV4 y define_bool CONFIG_ALPHA_EV4 y
define_bool CONFIG_ALPHA_APECS y define_bool CONFIG_ALPHA_APECS y
fi fi
define_bool CONFIG_PCI y
fi fi
if [ "$CONFIG_ALPHA_SABLE" = "y" ] if [ "$CONFIG_ALPHA_SABLE" = "y" ]
then then
define_bool CONFIG_PCI y
bool 'EV5 CPU(s) (model 5/xxx)?' CONFIG_ALPHA_GAMMA bool 'EV5 CPU(s) (model 5/xxx)?' CONFIG_ALPHA_GAMMA
if [ "$CONFIG_ALPHA_GAMMA" = "y" ] if [ "$CONFIG_ALPHA_GAMMA" = "y" ]
then then
...@@ -124,26 +121,22 @@ fi ...@@ -124,26 +121,22 @@ fi
if [ "$CONFIG_ALPHA_MIATA" = "y" -o "$CONFIG_ALPHA_LX164" = "y" \ if [ "$CONFIG_ALPHA_MIATA" = "y" -o "$CONFIG_ALPHA_LX164" = "y" \
-o "$CONFIG_ALPHA_SX164" = "y" -o "$CONFIG_ALPHA_RUFFIAN" = "y" ] -o "$CONFIG_ALPHA_SX164" = "y" -o "$CONFIG_ALPHA_RUFFIAN" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_CIA y define_bool CONFIG_ALPHA_CIA y
define_bool CONFIG_ALPHA_PYXIS y define_bool CONFIG_ALPHA_PYXIS y
fi fi
if [ "$CONFIG_ALPHA_DP264" = "y" -o "$CONFIG_ALPHA_EIGER" = "y" ] if [ "$CONFIG_ALPHA_DP264" = "y" -o "$CONFIG_ALPHA_EIGER" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV6 y define_bool CONFIG_ALPHA_EV6 y
define_bool CONFIG_ALPHA_TSUNAMI y define_bool CONFIG_ALPHA_TSUNAMI y
fi fi
if [ "$CONFIG_ALPHA_RAWHIDE" = "y" ] if [ "$CONFIG_ALPHA_RAWHIDE" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_MCPCIA y define_bool CONFIG_ALPHA_MCPCIA y
fi fi
if [ "$CONFIG_ALPHA_RX164" = "y" ] if [ "$CONFIG_ALPHA_RX164" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV5 y define_bool CONFIG_ALPHA_EV5 y
define_bool CONFIG_ALPHA_POLARIS y define_bool CONFIG_ALPHA_POLARIS y
fi fi
...@@ -153,7 +146,6 @@ then ...@@ -153,7 +146,6 @@ then
fi fi
if [ "$CONFIG_ALPHA_NAUTILUS" = "y" ] if [ "$CONFIG_ALPHA_NAUTILUS" = "y" ]
then then
define_bool CONFIG_PCI y
define_bool CONFIG_ALPHA_EV6 y define_bool CONFIG_ALPHA_EV6 y
define_bool CONFIG_ALPHA_IRONGATE y define_bool CONFIG_ALPHA_IRONGATE y
fi fi
......
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# #
# CONFIG_UID16 is not set
# #
# Code maturity level options # Code maturity level options
...@@ -44,7 +45,9 @@ CONFIG_ALPHA_GENERIC=y ...@@ -44,7 +45,9 @@ CONFIG_ALPHA_GENERIC=y
# CONFIG_ALPHA_SX164 is not set # CONFIG_ALPHA_SX164 is not set
# CONFIG_ALPHA_SABLE is not set # CONFIG_ALPHA_SABLE is not set
# CONFIG_ALPHA_TAKARA is not set # CONFIG_ALPHA_TAKARA is not set
CONFIG_ISA=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_ALPHA_BROKEN_IRQ_MASK=y
# CONFIG_SMP is not set # CONFIG_SMP is not set
CONFIG_PCI_NAMES=y CONFIG_PCI_NAMES=y
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
...@@ -58,6 +61,10 @@ CONFIG_BINFMT_AOUT=y ...@@ -58,6 +61,10 @@ CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set # CONFIG_BINFMT_MISC is not set
CONFIG_BINFMT_EM86=y CONFIG_BINFMT_EM86=y
#
# Parallel port support
#
# CONFIG_PARPORT is not set # CONFIG_PARPORT is not set
# #
...@@ -70,7 +77,10 @@ CONFIG_BINFMT_EM86=y ...@@ -70,7 +77,10 @@ CONFIG_BINFMT_EM86=y
# Block devices # Block devices
# #
CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# #
# Additional Block Devices # Additional Block Devices
...@@ -79,10 +89,6 @@ CONFIG_BLK_DEV_FD=y ...@@ -79,10 +89,6 @@ CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_PARIDE_PARPORT=y
# CONFIG_PARIDE is not set
# #
# Networking options # Networking options
...@@ -113,11 +119,14 @@ CONFIG_SKB_LARGE=y ...@@ -113,11 +119,14 @@ CONFIG_SKB_LARGE=y
# #
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
# CONFIG_DECNET is not set
# #
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
# CONFIG_IDE is not set # CONFIG_IDE is not set
# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
...@@ -128,9 +137,11 @@ CONFIG_SCSI=y ...@@ -128,9 +137,11 @@ CONFIG_SCSI=y
# SCSI support type (disk, tape, CD-ROM) # SCSI support type (disk, tape, CD-ROM)
# #
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40
# CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_ST is not set
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_SR_EXTRA_DEVS=2
# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SG is not set
# #
...@@ -144,6 +155,7 @@ CONFIG_SCSI_CONSTANTS=y ...@@ -144,6 +155,7 @@ CONFIG_SCSI_CONSTANTS=y
# #
# SCSI low-level drivers # SCSI low-level drivers
# #
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AHA152X is not set
...@@ -178,6 +190,7 @@ CONFIG_SCSI_CONSTANTS=y ...@@ -178,6 +190,7 @@ CONFIG_SCSI_CONSTANTS=y
# CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_FAS is not set
CONFIG_SCSI_QLOGIC_ISP=y CONFIG_SCSI_QLOGIC_ISP=y
# CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_SEAGATE is not set # CONFIG_SCSI_SEAGATE is not set
# CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_T128 is not set # CONFIG_SCSI_T128 is not set
...@@ -194,6 +207,7 @@ CONFIG_NETDEVICES=y ...@@ -194,6 +207,7 @@ CONFIG_NETDEVICES=y
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
CONFIG_DUMMY=m CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set # CONFIG_EQUALIZER is not set
# CONFIG_NET_SB1000 is not set # CONFIG_NET_SB1000 is not set
...@@ -207,15 +221,17 @@ CONFIG_NET_ETHERNET=y ...@@ -207,15 +221,17 @@ CONFIG_NET_ETHERNET=y
# CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_DEPCA is not set # CONFIG_DEPCA is not set
# CONFIG_NET_ISA is not set # CONFIG_NET_ISA is not set
CONFIG_NET_EISA=y CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set # CONFIG_PCNET32 is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_APRICOT is not set # CONFIG_APRICOT is not set
# CONFIG_CS89x0 is not set # CONFIG_CS89x0 is not set
CONFIG_DE4X5=y CONFIG_DE4X5=y
# CONFIG_DEC_ELCP is not set # CONFIG_TULIP is not set
# CONFIG_DGRS is not set # CONFIG_DGRS is not set
# CONFIG_EEXPRESS_PRO100 is not set # CONFIG_EEPRO100 is not set
# CONFIG_NE2K_PCI is not set # CONFIG_NE2K_PCI is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set # CONFIG_SIS900 is not set
# CONFIG_TLAN is not set # CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set # CONFIG_VIA_RHINE is not set
...@@ -236,7 +252,7 @@ CONFIG_DE4X5=y ...@@ -236,7 +252,7 @@ CONFIG_DE4X5=y
# CONFIG_NET_RADIO is not set # CONFIG_NET_RADIO is not set
# #
# Token Ring driver support # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_NET_FC is not set # CONFIG_NET_FC is not set
...@@ -321,15 +337,20 @@ CONFIG_PSMOUSE=y ...@@ -321,15 +337,20 @@ CONFIG_PSMOUSE=y
# CONFIG_USB is not set # CONFIG_USB is not set
# #
# Filesystems # File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set # CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_FAT_FS is not set # CONFIG_FAT_FS is not set
# CONFIG_MSDOS_FS is not set # CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set # CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set # CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set # CONFIG_CRAMFS is not set
CONFIG_ISO9660_FS=y CONFIG_ISO9660_FS=y
# CONFIG_JOLIET is not set # CONFIG_JOLIET is not set
...@@ -337,7 +358,10 @@ CONFIG_ISO9660_FS=y ...@@ -337,7 +358,10 @@ CONFIG_ISO9660_FS=y
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set # CONFIG_SYSV_FS is not set
...@@ -349,6 +373,7 @@ CONFIG_EXT2_FS=y ...@@ -349,6 +373,7 @@ CONFIG_EXT2_FS=y
# #
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
# CONFIG_ROOT_NFS is not set
# CONFIG_NFSD is not set # CONFIG_NFSD is not set
CONFIG_SUNRPC=y CONFIG_SUNRPC=y
CONFIG_LOCKD=y CONFIG_LOCKD=y
...@@ -361,8 +386,6 @@ CONFIG_LOCKD=y ...@@ -361,8 +386,6 @@ CONFIG_LOCKD=y
# CONFIG_PARTITION_ADVANCED is not set # CONFIG_PARTITION_ADVANCED is not set
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
CONFIG_MSDOS_PARTITION=y CONFIG_MSDOS_PARTITION=y
# CONFIG_SGI_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_NLS is not set # CONFIG_NLS is not set
# #
......
...@@ -119,6 +119,8 @@ if [ "$CONFIG_ARCH_NEXUSPCI" = "y" -o \ ...@@ -119,6 +119,8 @@ if [ "$CONFIG_ARCH_NEXUSPCI" = "y" -o \
"$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then "$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then
define_bool CONFIG_PCI y define_bool CONFIG_PCI y
source drivers/pci/Config.in source drivers/pci/Config.in
else
define_bool CONFIG_PCI n
fi fi
# #
...@@ -127,8 +129,10 @@ fi ...@@ -127,8 +129,10 @@ fi
if [ "$CONFIG_ARCH_CATS" = "y" -o \ if [ "$CONFIG_ARCH_CATS" = "y" -o \
"$CONFIG_ARCH_SHARK" = "y" -o \ "$CONFIG_ARCH_SHARK" = "y" -o \
"$CONFIG_ARCH_NETWINDER" = "y" ]; then "$CONFIG_ARCH_NETWINDER" = "y" ]; then
define_bool CONFIG_ISA y
define_bool CONFIG_ISA_DMA y define_bool CONFIG_ISA_DMA y
else else
define_bool CONFIG_ISA n
define_bool CONFIG_ISA_DMA n define_bool CONFIG_ISA_DMA n
fi fi
......
This diff is collapsed.
...@@ -19,11 +19,11 @@ choice 'Kernel page size' \ ...@@ -19,11 +19,11 @@ choice 'Kernel page size' \
if [ "$CONFIG_IA64_DIG" = "y" ]; then if [ "$CONFIG_IA64_DIG" = "y" ]; then
bool ' Enable Itanium A-step specific code' CONFIG_ITANIUM_ASTEP_SPECIFIC bool ' Enable Itanium A-step specific code' CONFIG_ITANIUM_ASTEP_SPECIFIC
bool ' Enable SoftSDV hacks' CONFIG_IA64_SOFTSDV_HACKS n bool ' Enable SoftSDV hacks' CONFIG_IA64_SOFTSDV_HACKS
bool ' Enable BigSur hacks' CONFIG_IA64_BIGSUR_HACKS y bool ' Enable BigSur hacks' CONFIG_IA64_BIGSUR_HACKS
bool ' Enable Lion hacks' CONFIG_IA64_LION_HACKS n bool ' Enable Lion hacks' CONFIG_IA64_LION_HACKS
bool ' Emulate PAL/SAL/EFI firmware' CONFIG_IA64_FW_EMU n bool ' Emulate PAL/SAL/EFI firmware' CONFIG_IA64_FW_EMU
bool ' Get PCI IRQ routing from firmware/ACPI' CONFIG_IA64_IRQ_ACPI y bool ' Get PCI IRQ routing from firmware/ACPI' CONFIG_IA64_IRQ_ACPI
fi fi
if [ "$CONFIG_IA64_GENERIC" = "y" ]; then if [ "$CONFIG_IA64_GENERIC" = "y" ]; then
...@@ -37,33 +37,32 @@ fi ...@@ -37,33 +37,32 @@ fi
define_bool CONFIG_KCORE_ELF y # On IA-64, we always want an ELF /proc/kcore. define_bool CONFIG_KCORE_ELF y # On IA-64, we always want an ELF /proc/kcore.
bool 'SMP support' CONFIG_SMP n bool 'SMP support' CONFIG_SMP
bool 'Performance monitor support' CONFIG_PERFMON n bool 'Performance monitor support' CONFIG_PERFMON
bool 'Networking support' CONFIG_NET n bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC n bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT n bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL n bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'PCI support' CONFIG_PCI n bool 'PCI support' CONFIG_PCI
source drivers/pci/Config.in source drivers/pci/Config.in
source drivers/pcmcia/Config.in source drivers/pcmcia/Config.in
mainmenu_option next_comment mainmenu_option next_comment
comment 'Code maturity level options' comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' \ bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
CONFIG_EXPERIMENTAL n
endmenu endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'Loadable module support' comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES n bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then if [ "$CONFIG_MODULES" = "y" ]; then
bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS n bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS
bool 'Kernel module loader' CONFIG_KMOD n bool 'Kernel module loader' CONFIG_KMOD
fi fi
endmenu endmenu
...@@ -99,7 +98,7 @@ tristate 'SCSI support' CONFIG_SCSI ...@@ -99,7 +98,7 @@ tristate 'SCSI support' CONFIG_SCSI
if [ "$CONFIG_SCSI" != "n" ]; then if [ "$CONFIG_SCSI" != "n" ]; then
source drivers/scsi/Config.in source drivers/scsi/Config.in
bool 'Simulated SCSI disk' CONFIG_SCSI_SIM n bool 'Simulated SCSI disk' CONFIG_SCSI_SIM
fi fi
endmenu endmenu
...@@ -107,7 +106,7 @@ if [ "$CONFIG_NET" = "y" ]; then ...@@ -107,7 +106,7 @@ if [ "$CONFIG_NET" = "y" ]; then
mainmenu_option next_comment mainmenu_option next_comment
comment 'Network device support' comment 'Network device support'
bool 'Network device support' CONFIG_NETDEVICES n bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then if [ "$CONFIG_NETDEVICES" = "y" ]; then
source drivers/net/Config.in source drivers/net/Config.in
fi fi
...@@ -128,7 +127,7 @@ endmenu ...@@ -128,7 +127,7 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)' comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'
bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI n bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
source drivers/cdrom/Config.in source drivers/cdrom/Config.in
fi fi
...@@ -145,11 +144,11 @@ source fs/nls/Config.in ...@@ -145,11 +144,11 @@ source fs/nls/Config.in
if [ "$CONFIG_VT" = "y" ]; then if [ "$CONFIG_VT" = "y" ]; then
mainmenu_option next_comment mainmenu_option next_comment
comment 'Console drivers' comment 'Console drivers'
bool 'VGA text console' CONFIG_VGA_CONSOLE n bool 'VGA text console' CONFIG_VGA_CONSOLE
source drivers/video/Config.in
if [ "$CONFIG_FB" = "y" ]; then if [ "$CONFIG_FB" = "y" ]; then
define_bool CONFIG_PCI_CONSOLE y define_bool CONFIG_PCI_CONSOLE y
fi fi
source drivers/video/Config.in
endmenu endmenu
fi fi
...@@ -173,11 +172,11 @@ else ...@@ -173,11 +172,11 @@ else
define_bool CONFIG_MATHEMU y define_bool CONFIG_MATHEMU y
fi fi
bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ n bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
bool 'Early printk support (requires VGA!)' CONFIG_IA64_EARLY_PRINTK n bool 'Early printk support (requires VGA!)' CONFIG_IA64_EARLY_PRINTK
bool 'Turn on compare-and-exchange bug checking (slow!)' CONFIG_IA64_DEBUG_CMPXCHG n bool 'Turn on compare-and-exchange bug checking (slow!)' CONFIG_IA64_DEBUG_CMPXCHG
bool 'Turn on irq debug checks (slow!)' CONFIG_IA64_DEBUG_IRQ n bool 'Turn on irq debug checks (slow!)' CONFIG_IA64_DEBUG_IRQ
bool 'Print possible IA64 hazards to console' CONFIG_IA64_PRINT_HAZARDS n bool 'Print possible IA64 hazards to console' CONFIG_IA64_PRINT_HAZARDS
bool 'Built-in Kernel Debugger support' CONFIG_KDB bool 'Built-in Kernel Debugger support' CONFIG_KDB
if [ "$CONFIG_KDB" = "y" ]; then if [ "$CONFIG_KDB" = "y" ]; then
bool 'Compile the kernel with frame pointers' CONFIG_KDB_FRAMEPTR bool 'Compile the kernel with frame pointers' CONFIG_KDB_FRAMEPTR
......
...@@ -2,6 +2,35 @@ ...@@ -2,6 +2,35 @@
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# #
#
# General setup
#
CONFIG_IA64=y
# CONFIG_IA64_GENERIC is not set
CONFIG_IA64_HP_SIM=y
# CONFIG_IA64_SGI_SN1_SIM is not set
# CONFIG_IA64_DIG is not set
# CONFIG_IA64_PAGE_SIZE_4KB is not set
# CONFIG_IA64_PAGE_SIZE_8KB is not set
CONFIG_IA64_PAGE_SIZE_16KB=y
# CONFIG_IA64_PAGE_SIZE_64KB is not set
CONFIG_KCORE_ELF=y
# CONFIG_SMP is not set
# CONFIG_PERFMON is not set
# CONFIG_NET is not set
# CONFIG_SYSVIPC is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_SYSCTL is not set
# CONFIG_BINFMT_ELF is not set
# CONFIG_BINFMT_MISC is not set
CONFIG_PCI=y
CONFIG_PCI_NAMES=y
#
# PCMCIA/CardBus support
#
# CONFIG_PCMCIA is not set
# #
# Code maturity level options # Code maturity level options
# #
...@@ -13,53 +42,56 @@ CONFIG_EXPERIMENTAL=y ...@@ -13,53 +42,56 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MODULES is not set # CONFIG_MODULES is not set
# #
# General setup # Parallel port support
# #
CONFIG_IA64_SIM=y
CONFIG_PCI=y
# CONFIG_PCI_QUIRKS is not set
CONFIG_PCI_OLD_PROC=y
# CONFIG_NET is not set
# CONFIG_SYSVIPC is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_SYSCTL is not set
# CONFIG_BINFMT_ELF is not set
# CONFIG_BINFMT_MISC is not set
# CONFIG_BINFMT_JAVA is not set
# CONFIG_BINFMT_EM86 is not set
# CONFIG_PARPORT is not set # CONFIG_PARPORT is not set
# #
# Plug and Play support # Plug and Play configuration
# #
# CONFIG_PNP is not set # CONFIG_PNP is not set
# CONFIG_ISAPNP is not set
# #
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# #
# Additional Block Devices # Additional Block Devices
# #
# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_XD is not set
CONFIG_PARIDE_PARPORT=y #
# CONFIG_PARIDE is not set # I2O device support
#
# CONFIG_I2O is not set
# CONFIG_I2O_PCI is not set
# CONFIG_I2O_BLOCK is not set
# CONFIG_I2O_SCSI is not set
# CONFIG_I2O_PROC is not set
# #
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
CONFIG_IDE=y CONFIG_IDE=y
#
# IDE, ATA and ATAPI Block devices
#
CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDE=y
# #
# Please see Documentation/ide.txt for help/info on IDE drives # Please see Documentation/ide.txt for help/info on IDE drives
# #
# CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_IDEDISK_MULTI_MODE is not set
# CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECS is not set
...@@ -78,24 +110,44 @@ CONFIG_BLK_DEV_IDECD=y ...@@ -78,24 +110,44 @@ CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDEPCI_SHARE_IRQ=y
CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_IDEDMA_PCI_AUTO=y CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set CONFIG_BLK_DEV_IDEDMA=y
CONFIG_IDEDMA_PCI_EXPERIMENTAL=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
# CONFIG_BLK_DEV_OFFBOARD is not set # CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
# CONFIG_BLK_DEV_AEC6210 is not set
# CONFIG_AEC6210_TUNING is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD7409 is not set
# CONFIG_AMD7409_OVERRIDE is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_CMD64X_RAID is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_HPT366_FIP is not set
# CONFIG_HPT366_MODE3 is not set
CONFIG_BLK_DEV_PIIX=y CONFIG_BLK_DEV_PIIX=y
CONFIG_PIIX_TUNING=y CONFIG_PIIX_TUNING=y
CONFIG_BLK_DEV_IDEDMA=y # CONFIG_BLK_DEV_NS87415 is not set
CONFIG_IDEDMA_AUTO=y # CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_PDC202XX is not set
# CONFIG_PDC202XX_BURST is not set
# CONFIG_PDC202XX_MASTER is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_IDE_CHIPSETS is not set # CONFIG_IDE_CHIPSETS is not set
CONFIG_IDEDMA_AUTO=y
CONFIG_BLK_DEV_IDE_MODES=y CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
# #
# CONFIG_SCSI is not set # CONFIG_SCSI is not set
# CONFIG_SCSI_G_NCR5380_PORT is not set
# CONFIG_SCSI_G_NCR5380_MEM is not set
# #
# Amateur Radio support # Amateur Radio support
...@@ -120,51 +172,91 @@ CONFIG_BLK_DEV_IDE_MODES=y ...@@ -120,51 +172,91 @@ CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_EXTENDED is not set
# CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_UNIX98_PTYS is not set # CONFIG_UNIX98_PTYS is not set
#
# I2C support
#
# CONFIG_I2C is not set
#
# Mice
#
# CONFIG_BUSMOUSE is not set
# CONFIG_MOUSE is not set # CONFIG_MOUSE is not set
#
# Joysticks
#
# CONFIG_JOYSTICK is not set
# CONFIG_QIC02_TAPE is not set # CONFIG_QIC02_TAPE is not set
#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set # CONFIG_RTC is not set
CONFIG_EFI_RTC=y CONFIG_EFI_RTC=y
#
# Video For Linux
#
# CONFIG_VIDEO_DEV is not set # CONFIG_VIDEO_DEV is not set
# CONFIG_NVRAM is not set # CONFIG_DTLK is not set
# CONFIG_JOYSTICK is not set # CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# #
# Ftape, the floppy tape device driver # Ftape, the floppy tape device driver
# #
# CONFIG_FTAPE is not set # CONFIG_FTAPE is not set
# CONFIG_FT_NORMAL_DEBUG is not set # CONFIG_DRM is not set
# CONFIG_FT_FULL_DEBUG is not set # CONFIG_DRM_TDFX is not set
# CONFIG_FT_NO_TRACE is not set # CONFIG_AGP is not set
# CONFIG_FT_NO_TRACE_AT_ALL is not set
# CONFIG_FT_STD_FDC is not set
# CONFIG_FT_MACH2 is not set
# CONFIG_FT_PROBE_FC10 is not set
# CONFIG_FT_ALT_FDC is not set
# #
# Filesystems # USB support
#
# CONFIG_USB is not set
#
# File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
# CONFIG_MINIX_FS is not set # CONFIG_AUTOFS_FS is not set
# CONFIG_EXT2_FS is not set # CONFIG_AUTOFS4_FS is not set
# CONFIG_ISO9660_FS is not set # CONFIG_ADFS_FS is not set
# CONFIG_FAT_FS is not set
# CONFIG_PROC_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_AFFS_FS is not set # CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set # CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_FAT_FS is not set
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_PROC_FS is not set
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
# CONFIG_AUTOFS_FS is not set # CONFIG_EXT2_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set
# CONFIG_UFS_FS is not set # CONFIG_UFS_FS is not set
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_SMD_DISKLABEL is not set #
# CONFIG_SOLARIS_X86_PARTITION is not set # Partition Types
# CONFIG_ADFS_FS is not set #
# CONFIG_QNX4FS_FS is not set # CONFIG_PARTITION_ADVANCED is not set
# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y
# CONFIG_NLS is not set
# CONFIG_NLS is not set # CONFIG_NLS is not set
# #
...@@ -175,5 +267,11 @@ CONFIG_EFI_RTC=y ...@@ -175,5 +267,11 @@ CONFIG_EFI_RTC=y
# #
# Kernel hacking # Kernel hacking
# #
# CONFIG_IA32_SUPPORT is not set
# CONFIG_MATHEMU is not set # CONFIG_MATHEMU is not set
# CONFIG_MAGIC_SYSRQ is not set # CONFIG_MAGIC_SYSRQ is not set
# CONFIG_IA64_EARLY_PRINTK is not set
# CONFIG_IA64_DEBUG_CMPXCHG is not set
# CONFIG_IA64_DEBUG_IRQ is not set
# CONFIG_IA64_PRINT_HAZARDS is not set
# CONFIG_KDB is not set
...@@ -15,6 +15,7 @@ endmenu ...@@ -15,6 +15,7 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'Platform dependent setup' comment 'Platform dependent setup'
define_bool CONFIG_ISA n
bool 'Amiga support' CONFIG_AMIGA bool 'Amiga support' CONFIG_AMIGA
bool 'Atari support' CONFIG_ATARI bool 'Atari support' CONFIG_ATARI
if [ "$CONFIG_ATARI" = "y" ]; then if [ "$CONFIG_ATARI" = "y" ]; then
......
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# #
CONFIG_UID16=y
# #
# Code maturity level options # Code maturity level options
...@@ -8,18 +9,19 @@ ...@@ -8,18 +9,19 @@
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
# #
# Loadable module support # Platform dependent setup
#
# CONFIG_MODULES is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_KMOD is not set
#
# Platform-dependent setup
# #
# CONFIG_ISA is not set
CONFIG_AMIGA=y CONFIG_AMIGA=y
# CONFIG_ATARI is not set # CONFIG_ATARI is not set
# CONFIG_PCI is not set
# CONFIG_MAC is not set # CONFIG_MAC is not set
# CONFIG_APOLLO is not set
# CONFIG_VME is not set
# CONFIG_HP300 is not set
# CONFIG_SUN3X is not set
# CONFIG_SUN3 is not set
# CONFIG_Q40 is not set
# #
# Processor type # Processor type
...@@ -28,42 +30,48 @@ CONFIG_M68020=y ...@@ -28,42 +30,48 @@ CONFIG_M68020=y
CONFIG_M68030=y CONFIG_M68030=y
CONFIG_M68040=y CONFIG_M68040=y
# CONFIG_M68060 is not set # CONFIG_M68060 is not set
# CONFIG_M68KFPU_EMU is not set
# CONFIG_ADVANCED is not set # CONFIG_ADVANCED is not set
# CONFIG_SINGLE_MEMORY_CHUNK is not set
# CONFIG_RMW_INSNS is not set
# #
# General setup # General setup
# #
CONFIG_NET=y CONFIG_NET=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_ZORRO=y CONFIG_ZORRO=y
# CONFIG_AMIGA_GSP is not set
# CONFIG_GSP_RESOLVER is not set
# CONFIG_GSP_A2410 is not set
# CONFIG_AMIGA_PCMCIA is not set # CONFIG_AMIGA_PCMCIA is not set
# CONFIG_HEARTBEAT is not set # CONFIG_HEARTBEAT is not set
CONFIG_PROC_HARDWARE=y CONFIG_PROC_HARDWARE=y
# CONFIG_PARPORT is not set
# CONFIG_PRINTER is not set
#
# Loadable module support
#
# CONFIG_MODULES is not set
# #
# Block device driver configuration # Block devices
# #
# CONFIG_BLK_DEV_FD is not set
CONFIG_AMIGA_FLOPPY=y CONFIG_AMIGA_FLOPPY=y
CONFIG_ATARI_FLOPPY=y
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_AMIGA_Z2RAM is not set # CONFIG_AMIGA_Z2RAM is not set
# CONFIG_ATARI_ACSI is not set # CONFIG_BLK_DEV_XD is not set
# CONFIG_ACSI_MULTI_LUN is not set # CONFIG_PARIDE is not set
# CONFIG_ATARI_SLM
#
# Additional Block Devices
#
# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
# CONFIG_MD_LINEAR is not set
# CONFIG_MD_STRIPED is not set
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
...@@ -71,8 +79,9 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -71,8 +79,9 @@ CONFIG_BLK_DEV_INITRD=y
# Networking options # Networking options
# #
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
# CONFIG_NETLINK is not set # CONFIG_NETLINK is not set
# CONFIG_FIREWALL is not set # CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set # CONFIG_FILTER is not set
CONFIG_UNIX=y CONFIG_UNIX=y
CONFIG_INET=y CONFIG_INET=y
...@@ -88,16 +97,17 @@ CONFIG_INET=y ...@@ -88,16 +97,17 @@ CONFIG_INET=y
# #
# (it is safe to leave these untouched) # (it is safe to leave these untouched)
# #
# CONFIG_INET_RARP is not set
CONFIG_IP_NOSR=y
# CONFIG_SKB_LARGE is not set # CONFIG_SKB_LARGE is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
# #
# #
# #
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
# CONFIG_DECNET is not set
# CONFIG_X25 is not set # CONFIG_X25 is not set
# CONFIG_LAPB is not set # CONFIG_LAPB is not set
# CONFIG_BRIDGE is not set # CONFIG_BRIDGE is not set
...@@ -106,7 +116,6 @@ CONFIG_IP_NOSR=y ...@@ -106,7 +116,6 @@ CONFIG_IP_NOSR=y
# CONFIG_WAN_ROUTER is not set # CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set # CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set # CONFIG_NET_HW_FLOWCONTROL is not set
# CONFIG_CPU_IS_SLOW is not set
# #
# QoS and/or fair queueing # QoS and/or fair queueing
...@@ -117,6 +126,8 @@ CONFIG_IP_NOSR=y ...@@ -117,6 +126,8 @@ CONFIG_IP_NOSR=y
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
# CONFIG_IDE is not set # CONFIG_IDE is not set
# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
...@@ -124,12 +135,15 @@ CONFIG_IP_NOSR=y ...@@ -124,12 +135,15 @@ CONFIG_IP_NOSR=y
CONFIG_SCSI=y CONFIG_SCSI=y
# #
# SCSI support type (disk, tape, CDrom) # SCSI support type (disk, tape, CD-ROM)
# #
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40
CONFIG_CHR_DEV_ST=y CONFIG_CHR_DEV_ST=y
CONFIG_ST_EXTRA_DEVS=2
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_SR_EXTRA_DEVS=2
# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SG is not set
# #
...@@ -143,6 +157,7 @@ CONFIG_SCSI_CONSTANTS=y ...@@ -143,6 +157,7 @@ CONFIG_SCSI_CONSTANTS=y
# SCSI low-level drivers # SCSI low-level drivers
# #
CONFIG_A3000_SCSI=y CONFIG_A3000_SCSI=y
# CONFIG_A4000T_SCSI is not set
CONFIG_A2091_SCSI=y CONFIG_A2091_SCSI=y
CONFIG_GVP11_SCSI=y CONFIG_GVP11_SCSI=y
# CONFIG_CYBERSTORM_SCSI is not set # CONFIG_CYBERSTORM_SCSI is not set
...@@ -150,13 +165,10 @@ CONFIG_GVP11_SCSI=y ...@@ -150,13 +165,10 @@ CONFIG_GVP11_SCSI=y
# CONFIG_BLZ2060_SCSI is not set # CONFIG_BLZ2060_SCSI is not set
# CONFIG_BLZ1230_SCSI is not set # CONFIG_BLZ1230_SCSI is not set
# CONFIG_FASTLANE_SCSI is not set # CONFIG_FASTLANE_SCSI is not set
# CONFIG_A4000T_SCSI is not set
# CONFIG_A4091_SCSI is not set # CONFIG_A4091_SCSI is not set
# CONFIG_WARPENGINE_SCSI is not set # CONFIG_WARPENGINE_SCSI is not set
# CONFIG_BLZ603EPLUS_SCSI is not set # CONFIG_BLZ603EPLUS_SCSI is not set
CONFIG_ATARI_SCSI=y # CONFIG_OKTAGON_SCSI is not set
# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
# CONFIG_ATARI_SCSI_RESET_BOOT is not set
# #
# Network device support # Network device support
...@@ -165,80 +177,150 @@ CONFIG_NETDEVICES=y ...@@ -165,80 +177,150 @@ CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set # CONFIG_DUMMY is not set
# CONFIG_SLIP is not set # CONFIG_SLIP is not set
# CONFIG_PPP is not set # CONFIG_PPP is not set
# CONFIG_EQUALIZER is not set
# CONFIG_ARIADNE is not set # CONFIG_ARIADNE is not set
# CONFIG_ARIADNE2 is not set # CONFIG_ARIADNE2 is not set
# CONFIG_A2065 is not set # CONFIG_A2065 is not set
# CONFIG_HYDRA is not set # CONFIG_HYDRA is not set
# CONFIG_APNE is not set
# CONFIG_ATARILANCE is not set
# CONFIG_ATARI_BIONET is not set
# CONFIG_ATARI_PAMSNET is not set
# #
# Filesystems # Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_AMIGAMOUSE=y
CONFIG_BUSMOUSE=y
CONFIG_AMIGA_BUILTIN_SERIAL=y
# CONFIG_GVPIOEXT is not set
# CONFIG_GVPIOEXT_LP is not set
# CONFIG_GVPIOEXT_PLIP is not set
# CONFIG_MULTIFACE_III_TTY is not set
# CONFIG_SERIAL_CONSOLE is not set
# CONFIG_USERIAL is not set
# CONFIG_WATCHDOG is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
#
# Sound support
#
# CONFIG_SOUND is not set
#
# File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
CONFIG_MINIX_FS=y # CONFIG_AUTOFS_FS is not set
CONFIG_EXT2_FS=y # CONFIG_AUTOFS4_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
CONFIG_FAT_FS=y CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y CONFIG_MSDOS_FS=y
# CONFIG_VFAT_FS is not set
# CONFIG_UMSDOS_FS is not set # CONFIG_UMSDOS_FS is not set
# CONFIG_MSDOS_PARTITION is not set # CONFIG_VFAT_FS is not set
CONFIG_PROC_FS=y # CONFIG_EFS_FS is not set
CONFIG_NFS_FS=y # CONFIG_CRAMFS is not set
# CONFIG_ROOT_NFS is not set
# CONFIG_SMB_FS is not set
# CONFIG_ISO9660_FS is not set # CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
CONFIG_MINIX_FS=y
# CONFIG_NTFS_FS is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
# CONFIG_SYSV_FS is not set CONFIG_PROC_FS=y
# CONFIG_AFFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set
# CONFIG_UFS_FS is not set # CONFIG_UFS_FS is not set
# CONFIG_CRAMFS is not set
# #
# Frame buffer devices # Network File Systems
#
# CONFIG_CODA_FS is not set
CONFIG_NFS_FS=y
# CONFIG_ROOT_NFS is not set
# CONFIG_NFSD is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
#
# Partition Types
# #
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_AMIGA_PARTITION=y
CONFIG_NLS=y
#
# Native Language Support
#
CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
#
# Console drivers
#
CONFIG_FB=y
#
# Frame-buffer support
#
CONFIG_FB=y
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FB_CLGEN is not set
# CONFIG_FB_PM2 is not set
CONFIG_FB_AMIGA=y CONFIG_FB_AMIGA=y
CONFIG_FB_AMIGA_OCS=y CONFIG_FB_AMIGA_OCS=y
CONFIG_FB_AMIGA_ECS=y CONFIG_FB_AMIGA_ECS=y
CONFIG_FB_AMIGA_AGA=y CONFIG_FB_AMIGA_AGA=y
# CONFIG_FB_CYBER is not set # CONFIG_FB_CYBER is not set
# CONFIG_FB_VIRGE is not set # CONFIG_FB_VIRGE is not set
# CONFIG_FB_CVPPC is not set
# CONFIG_FB_RETINAZ3 is not set # CONFIG_FB_RETINAZ3 is not set
# CONFIG_FB_CLGEN is not set # CONFIG_FB_FM2 is not set
# CONFIG_FB_ATARI is not set
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_FBCON_ADVANCED is not set # CONFIG_FBCON_ADVANCED is not set
CONFIG_FBCON_MFB=y
CONFIG_NLS_CODEPAGE_437=y CONFIG_FBCON_AFB=y
CONFIG_FBCON_ILBM=y
# # CONFIG_FBCON_FONTWIDTH8_ONLY is not set
# Character devices # CONFIG_FBCON_FONTS is not set
# CONFIG_FONT_8x8=y
CONFIG_VT=y CONFIG_FONT_8x16=y
CONFIG_VT_CONSOLE=y CONFIG_FONT_PEARL_8x8=y
# CONFIG_M68K_PRINTER is not set
CONFIG_AMIGAMOUSE=y
CONFIG_ATARIMOUSE=y
CONFIG_AMIGA_BUILTIN_SERIAL=y
# CONFIG_GVPIOEXT is not set
# CONFIG_GVPIOEXT_LP is not set
# CONFIG_GVPIOEXT_PLIP is not set
# CONFIG_MULTIFACE_III_TTY is not set
# CONFIG_USERIAL is not set
# CONFIG_WATCHDOG is not set
# CONFIG_UMISC is not set
#
# Sound
#
# CONFIG_SOUND is not set
# CONFIG_DMASOUND is not set
# #
# Kernel hacking # Kernel hacking
# #
CONFIG_SCSI_CONSTANTS=y # CONFIG_MAGIC_SYSRQ is not set
...@@ -26,34 +26,37 @@ bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI ...@@ -26,34 +26,37 @@ bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI
# #
# Select some configuration options automatically for certain systems. # Select some configuration options automatically for certain systems.
# #
unset CONFIG_PCI
unset CONFIG_ISA
unset CONFIG_MIPS_JAZZ unset CONFIG_MIPS_JAZZ
unset CONFIG_VIDEO_G364 unset CONFIG_VIDEO_G364
if [ "$CONFIG_ALGOR_P4032" = "y" ]; then if [ "$CONFIG_ALGOR_P4032" = "y" -o "$CONFIG_SNI_RM200_PCI" = "y" -o \
"$CONFIG_DDB5074" = "y" ]; then
define_bool CONFIG_PCI y define_bool CONFIG_PCI y
else
define_bool CONFIG_PCI n
fi fi
if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o "$CONFIG_OLIVETTI_M700" = "y" -o \
"$CONFIG_SNI_RM200_PCI" = "y" -o "$CONFIG_ACER_PICA_61" = "y" ]; then
define_bool CONFIG_ISA y
else
define_bool CONFIG_ISA n
fi
if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \ if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
"$CONFIG_OLIVETTI_M700" = "y" ]; then "$CONFIG_OLIVETTI_M700" = "y" ]; then
define_bool CONFIG_ISA y
define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_HAVE_IO_PORTS y
define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_MIPS_JAZZ y
define_bool CONFIG_FB y define_bool CONFIG_FB y
define_bool CONFIG_FB_G364 y define_bool CONFIG_FB_G364 y
fi fi
if [ "$CONFIG_ACER_PICA_61" = "y" ]; then if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
define_bool CONFIG_ISA y
define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_HAVE_IO_PORTS y
define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_MIPS_JAZZ y
fi fi
if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then
define_bool CONFIG_ISA y
define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_HAVE_IO_PORTS y
define_bool CONFIG_PCI y
fi fi
if [ "$CONFIG_DDB5074" = "y" ]; then if [ "$CONFIG_DDB5074" = "y" ]; then
define_bool CONFIG_PCI y
define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_HAVE_IO_PORTS y
fi fi
endmenu endmenu
......
...@@ -19,6 +19,8 @@ CONFIG_EXPERIMENTAL=y ...@@ -19,6 +19,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_OLIVETTI_M700 is not set # CONFIG_OLIVETTI_M700 is not set
CONFIG_SGI_IP22=y CONFIG_SGI_IP22=y
# CONFIG_SNI_RM200_PCI is not set # CONFIG_SNI_RM200_PCI is not set
# CONFIG_PCI is not set
# CONFIG_ISA is not set
# #
# CPU selection # CPU selection
...@@ -73,6 +75,8 @@ CONFIG_KMOD=y ...@@ -73,6 +75,8 @@ CONFIG_KMOD=y
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# #
# Additional Block Devices # Additional Block Devices
...@@ -81,8 +85,6 @@ CONFIG_KMOD=y ...@@ -81,8 +85,6 @@ CONFIG_KMOD=y
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# #
# Networking options # Networking options
...@@ -133,16 +135,12 @@ CONFIG_IP_PNP_BOOTP=y ...@@ -133,16 +135,12 @@ CONFIG_IP_PNP_BOOTP=y
# #
# CONFIG_NET_SCHED is not set # CONFIG_NET_SCHED is not set
#
# Telephony Support
#
# CONFIG_PHONE is not set
# CONFIG_PHONE_IXJ is not set
# #
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
# CONFIG_IDE is not set # CONFIG_IDE is not set
# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
...@@ -155,7 +153,6 @@ CONFIG_SCSI=y ...@@ -155,7 +153,6 @@ CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40 CONFIG_SD_EXTRA_DEVS=40
CONFIG_CHR_DEV_ST=y CONFIG_CHR_DEV_ST=y
CONFIG_ST_EXTRA_DEVS=2
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_SR_EXTRA_DEVS=2 CONFIG_SR_EXTRA_DEVS=2
...@@ -207,26 +204,80 @@ CONFIG_SCSI_SGIWD93=y ...@@ -207,26 +204,80 @@ CONFIG_SCSI_SGIWD93=y
# CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_ULTRASTOR is not set # CONFIG_SCSI_ULTRASTOR is not set
# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DEBUG is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# #
# I2O device support # Network device support
# #
# CONFIG_I2O is not set CONFIG_NETDEVICES=y
# CONFIG_I2O_PCI is not set
# CONFIG_I2O_BLOCK is not set
# CONFIG_I2O_LAN is not set
# CONFIG_I2O_SCSI is not set
# CONFIG_I2O_PROC is not set
# #
# Network device support # ARCnet devices
# #
CONFIG_NETDEVICES=y # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set # CONFIG_DUMMY is not set
# CONFIG_SLIP is not set # CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_NET_SB1000 is not set
#
# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set
#
# Ethernet (1000 Mbit)
#
# CONFIG_YELLOWFIN is not set
# CONFIG_ACENIC is not set
# CONFIG_SK98LIN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
# CONFIG_PPP is not set # CONFIG_PPP is not set
CONFIG_SGISEEQ=y # CONFIG_SLIP is not set
#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
#
# Token Ring devices
#
# CONFIG_TR is not set
# CONFIG_NET_FC is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set
#
# AX.25 network device drivers
#
# CONFIG_MKISS is not set
# CONFIG_6PACK is not set
# CONFIG_BPQETHER is not set
# CONFIG_DMASCC is not set
# CONFIG_SCC is not set
# CONFIG_BAYCOM_SER_FDX is not set
# CONFIG_BAYCOM_SER_HDX is not set
# CONFIG_BAYCOM_PAR is not set
# CONFIG_BAYCOM_EPP is not set
# CONFIG_SOUNDMODEM is not set
# CONFIG_YAM is not set
#
# ISDN subsystem
#
# CONFIG_ISDN is not set
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
# CONFIG_CD_NO_IDESCSI is not set
# #
# Character devices # Character devices
...@@ -336,8 +387,15 @@ CONFIG_LOCKD=y ...@@ -336,8 +387,15 @@ CONFIG_LOCKD=y
# #
# Partition Types # Partition Types
# #
# CONFIG_PARTITION_ADVANCED is not set CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
# CONFIG_MSDOS_PARTITION is not set
CONFIG_SGI_PARTITION=y CONFIG_SGI_PARTITION=y
# CONFIG_SUN_PARTITION is not set
# CONFIG_NLS is not set # CONFIG_NLS is not set
# #
......
...@@ -35,7 +35,8 @@ unset CONFIG_ARC64 ...@@ -35,7 +35,8 @@ unset CONFIG_ARC64
unset CONFIG_BOARD_SCACHE unset CONFIG_BOARD_SCACHE
unset CONFIG_COHERENT_IO unset CONFIG_COHERENT_IO
unset CONFIG_BINFMT_ELF32 unset CONFIG_BINFMT_ELF32
unset CONFIG_PCI
define_bool CONFIG_ISA n
if [ "$CONFIG_SGI_IP22" = "y" ]; then if [ "$CONFIG_SGI_IP22" = "y" ]; then
define_bool CONFIG_BOOT_ELF32 y define_bool CONFIG_BOOT_ELF32 y
...@@ -50,6 +51,8 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then ...@@ -50,6 +51,8 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then
define_bool CONFIG_COHERENT_IO y define_bool CONFIG_COHERENT_IO y
define_bool CONFIG_PCI y define_bool CONFIG_PCI y
define_bool CONFIG_QL_ISP_A64 y define_bool CONFIG_QL_ISP_A64 y
else
define_bool CONFIG_PCI n
fi fi
mainmenu_option next_comment mainmenu_option next_comment
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
CONFIG_SGI_IP27=y CONFIG_SGI_IP27=y
# CONFIG_SGI_SN0_N_MODE is not set # CONFIG_SGI_SN0_N_MODE is not set
# CONFIG_DISCONTIGMEM is not set # CONFIG_DISCONTIGMEM is not set
# CONFIG_ISA is not set
CONFIG_BOOT_ELF64=y CONFIG_BOOT_ELF64=y
CONFIG_ARC64=y CONFIG_ARC64=y
CONFIG_COHERENT_IO=y CONFIG_COHERENT_IO=y
...@@ -60,7 +61,10 @@ CONFIG_PCI_NAMES=y ...@@ -60,7 +61,10 @@ CONFIG_PCI_NAMES=y
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# #
# Additional Block Devices # Additional Block Devices
...@@ -69,9 +73,6 @@ CONFIG_PCI_NAMES=y ...@@ -69,9 +73,6 @@ CONFIG_PCI_NAMES=y
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_PARIDE is not set
# #
# Networking options # Networking options
...@@ -103,6 +104,7 @@ CONFIG_SKB_LARGE=y ...@@ -103,6 +104,7 @@ CONFIG_SKB_LARGE=y
# #
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
# CONFIG_DECNET is not set
# #
# Telephony Support # Telephony Support
...@@ -114,6 +116,8 @@ CONFIG_SKB_LARGE=y ...@@ -114,6 +116,8 @@ CONFIG_SKB_LARGE=y
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
# CONFIG_IDE is not set # CONFIG_IDE is not set
# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
...@@ -126,7 +130,6 @@ CONFIG_SCSI=y ...@@ -126,7 +130,6 @@ CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40 CONFIG_SD_EXTRA_DEVS=40
# CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_ST is not set
CONFIG_ST_EXTRA_DEVS=2
# CONFIG_BLK_DEV_SR is not set # CONFIG_BLK_DEV_SR is not set
# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SG is not set
...@@ -141,6 +144,7 @@ CONFIG_ST_EXTRA_DEVS=2 ...@@ -141,6 +144,7 @@ CONFIG_ST_EXTRA_DEVS=2
# #
# SCSI low-level drivers # SCSI low-level drivers
# #
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AHA152X is not set
...@@ -204,6 +208,7 @@ CONFIG_NETDEVICES=y ...@@ -204,6 +208,7 @@ CONFIG_NETDEVICES=y
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set # CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set # CONFIG_EQUALIZER is not set
# CONFIG_NET_SB1000 is not set # CONFIG_NET_SB1000 is not set
...@@ -218,7 +223,7 @@ CONFIG_SGI_IOC3_ETH=y ...@@ -218,7 +223,7 @@ CONFIG_SGI_IOC3_ETH=y
# CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_DEPCA is not set # CONFIG_DEPCA is not set
# CONFIG_NET_ISA is not set # CONFIG_NET_ISA is not set
# CONFIG_NET_EISA is not set # CONFIG_NET_PCI is not set
# CONFIG_NET_POCKET is not set # CONFIG_NET_POCKET is not set
# #
...@@ -237,7 +242,7 @@ CONFIG_SGI_IOC3_ETH=y ...@@ -237,7 +242,7 @@ CONFIG_SGI_IOC3_ETH=y
# CONFIG_NET_RADIO is not set # CONFIG_NET_RADIO is not set
# #
# Token Ring driver support # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_NET_FC is not set # CONFIG_NET_FC is not set
...@@ -324,7 +329,7 @@ CONFIG_SERIAL_CONSOLE=y ...@@ -324,7 +329,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_USB is not set # CONFIG_USB is not set
# #
# Filesystems # File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS_FS is not set
...@@ -343,20 +348,17 @@ CONFIG_SERIAL_CONSOLE=y ...@@ -343,20 +348,17 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_JOLIET is not set # CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set # CONFIG_MINIX_FS is not set
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS is not set # CONFIG_DEVPTS_FS is not set
# CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set # CONFIG_SYSV_FS is not set
# CONFIG_SYSV_FS_WRITE is not set
# CONFIG_UDF_FS is not set # CONFIG_UDF_FS is not set
# CONFIG_UDF_RW is not set
# CONFIG_UFS_FS is not set # CONFIG_UFS_FS is not set
# CONFIG_UFS_FS_WRITE is not set
# #
# Network File Systems # Network File Systems
...@@ -365,7 +367,6 @@ CONFIG_EXT2_FS=y ...@@ -365,7 +367,6 @@ CONFIG_EXT2_FS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
# CONFIG_NFSD is not set # CONFIG_NFSD is not set
# CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y CONFIG_SUNRPC=y
CONFIG_LOCKD=y CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set # CONFIG_SMB_FS is not set
...@@ -374,8 +375,15 @@ CONFIG_LOCKD=y ...@@ -374,8 +375,15 @@ CONFIG_LOCKD=y
# #
# Partition Types # Partition Types
# #
# CONFIG_PARTITION_ADVANCED is not set CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
# CONFIG_MSDOS_PARTITION is not set
CONFIG_SGI_PARTITION=y CONFIG_SGI_PARTITION=y
# CONFIG_SUN_PARTITION is not set
# CONFIG_NLS is not set # CONFIG_NLS is not set
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
......
...@@ -19,7 +19,7 @@ choice 'Processor Type' \ ...@@ -19,7 +19,7 @@ choice 'Processor Type' \
4xx CONFIG_4xx \ 4xx CONFIG_4xx \
630/Power3(64-Bit) CONFIG_PPC64 \ 630/Power3(64-Bit) CONFIG_PPC64 \
82xx CONFIG_82xx \ 82xx CONFIG_82xx \
8xx CONFIG_8xx" 6xx/7xx 8xx CONFIG_8xx" 6xx
if [ "$CONFIG_4xx" = "y" ]; then if [ "$CONFIG_4xx" = "y" ]; then
choice 'Machine Type' \ choice 'Machine Type' \
...@@ -82,20 +82,18 @@ endmenu ...@@ -82,20 +82,18 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
if [ "$CONFIG_APUS" = "y" ]; then define_bool CONFIG_ISA n
define_bool CONFIG_PCI n
fi if [ "$CONFIG_APUS" = "y" -o "$CONFIG_4xx" = "y" -o \
if [ "$CONFIG_OAK" = "y" ]; then "$CONFIG_82xx" = "y" ]; then
define_bool CONFIG_PCI n define_bool CONFIG_PCI n
fi else
if [ "$CONFIG_8xx" = "y" ]; then if [ "$CONFIG_6xx" = "y" -o CONFIG_PPC64 ]; then
bool 'QSpan PCI' CONFIG_PCI define_bool CONFIG_PCI y
fi else
if [ "$CONFIG_6xx" = "y" -a "$CONFIG_APUS" != "y" ]; then # CONFIG_8xx
define_bool CONFIG_PCI y bool 'QSpan PCI' CONFIG_PCI
fi fi
if [ "$CONFIG_PREP" = "y" -o "$CONFIG_PMAC" = "y" -o "$CONFIG_CHRP" = "y" -o "$CONFIG_ALL_PPC" = "y" ]; then
define_bool CONFIG_PCI y
fi fi
bool 'Networking support' CONFIG_NET bool 'Networking support' CONFIG_NET
......
...@@ -33,8 +33,7 @@ CONFIG_KMOD=y ...@@ -33,8 +33,7 @@ CONFIG_KMOD=y
# #
# General setup # General setup
# #
# CONFIG_PCI is not set # CONFIG_ISA is not set
CONFIG_PCI=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
...@@ -57,6 +56,7 @@ CONFIG_FB_COMPAT_XPMAC=y ...@@ -57,6 +56,7 @@ CONFIG_FB_COMPAT_XPMAC=y
CONFIG_PMAC_PBOOK=y CONFIG_PMAC_PBOOK=y
CONFIG_MAC_FLOPPY=y CONFIG_MAC_FLOPPY=y
CONFIG_MAC_SERIAL=y CONFIG_MAC_SERIAL=y
# CONFIG_SERIAL_CONSOLE is not set
CONFIG_ADB=y CONFIG_ADB=y
CONFIG_ADB_CUDA=y CONFIG_ADB_CUDA=y
CONFIG_ADB_MACIO=y CONFIG_ADB_MACIO=y
...@@ -73,12 +73,14 @@ CONFIG_BOOTX_TEXT=y ...@@ -73,12 +73,14 @@ CONFIG_BOOTX_TEXT=y
# Plug and Play configuration # Plug and Play configuration
# #
# CONFIG_PNP is not set # CONFIG_PNP is not set
# CONFIG_ISAPNP is not set
# #
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set # CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_DAC960 is not set
...@@ -158,6 +160,7 @@ CONFIG_BLK_DEV_IDE=y ...@@ -158,6 +160,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_IDEDISK_MULTI_MODE is not set
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set
...@@ -167,16 +170,38 @@ CONFIG_BLK_DEV_IDESCSI=y ...@@ -167,16 +170,38 @@ CONFIG_BLK_DEV_IDESCSI=y
# IDE chipset support/bugfixes # IDE chipset support/bugfixes
# #
# CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
# CONFIG_BLK_DEV_ISAPNP is not set
# CONFIG_BLK_DEV_RZ1000 is not set # CONFIG_BLK_DEV_RZ1000 is not set
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set # CONFIG_IDEPCI_SHARE_IRQ is not set
# CONFIG_BLK_DEV_IDEDMA_PCI is not set # CONFIG_BLK_DEV_IDEDMA_PCI is not set
# CONFIG_BLK_DEV_OFFBOARD is not set # CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_IDEDMA_PCI_AUTO is not set
# CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_BLK_DEV_IDEDMA is not set
CONFIG_IDEDMA_PCI_EXPERIMENTAL=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
# CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
# CONFIG_BLK_DEV_AEC6210 is not set
# CONFIG_AEC6210_TUNING is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD7409 is not set
# CONFIG_AMD7409_OVERRIDE is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_CMD64X_RAID is not set
# CONFIG_BLK_DEV_CY82C693 is not set # CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_HPT366_FIP is not set
# CONFIG_HPT366_MODE3 is not set
# CONFIG_BLK_DEV_NS87415 is not set # CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_OPTI621 is not set # CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_PDC202XX is not set
# CONFIG_PDC202XX_BURST is not set
# CONFIG_PDC202XX_MASTER is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SL82C105 is not set
...@@ -483,6 +508,7 @@ CONFIG_NVRAM=y ...@@ -483,6 +508,7 @@ CONFIG_NVRAM=y
# #
# CONFIG_FTAPE is not set # CONFIG_FTAPE is not set
# CONFIG_DRM is not set # CONFIG_DRM is not set
# CONFIG_DRM_TDFX is not set
# CONFIG_AGP is not set # CONFIG_AGP is not set
# #
...@@ -514,7 +540,9 @@ CONFIG_USB_OHCI=y ...@@ -514,7 +540,9 @@ CONFIG_USB_OHCI=y
# CONFIG_USB_IBMCAM is not set # CONFIG_USB_IBMCAM is not set
# CONFIG_USB_OV511 is not set # CONFIG_USB_OV511 is not set
# CONFIG_USB_DC2XX is not set # CONFIG_USB_DC2XX is not set
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE is not set
# CONFIG_USB_USS720 is not set
# CONFIG_USB_DABUSB is not set # CONFIG_USB_DABUSB is not set
# CONFIG_USB_PLUSB is not set # CONFIG_USB_PLUSB is not set
# CONFIG_USB_PEGASUS is not set # CONFIG_USB_PEGASUS is not set
...@@ -559,6 +587,7 @@ CONFIG_ISO9660_FS=y ...@@ -559,6 +587,7 @@ CONFIG_ISO9660_FS=y
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
...@@ -572,6 +601,7 @@ CONFIG_EXT2_FS=y ...@@ -572,6 +601,7 @@ CONFIG_EXT2_FS=y
# #
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
# CONFIG_ROOT_NFS is not set
CONFIG_NFSD=y CONFIG_NFSD=y
# CONFIG_NFSD_V3 is not set # CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y CONFIG_SUNRPC=y
...@@ -659,6 +689,7 @@ CONFIG_SOUND_CS4232=m ...@@ -659,6 +689,7 @@ CONFIG_SOUND_CS4232=m
# CONFIG_SOUND_NM256 is not set # CONFIG_SOUND_NM256 is not set
# CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_MAD16 is not set
# CONFIG_SOUND_PAS is not set # CONFIG_SOUND_PAS is not set
# CONFIG_PAS_JOYSTICK is not set
# CONFIG_SOUND_PSS is not set # CONFIG_SOUND_PSS is not set
# CONFIG_SOUND_SOFTOSS is not set # CONFIG_SOUND_SOFTOSS is not set
# CONFIG_SOUND_SB is not set # CONFIG_SOUND_SB is not set
......
...@@ -47,6 +47,8 @@ endmenu ...@@ -47,6 +47,8 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
define_bool CONFIG_ISA n
bool 'Networking support' CONFIG_NET bool 'Networking support' CONFIG_NET
bool 'Directy Connected Compact Flash support' CONFIG_CF_ENABLER bool 'Directy Connected Compact Flash support' CONFIG_CF_ENABLER
......
...@@ -28,6 +28,7 @@ CONFIG_MEMORY_START=0c000000 ...@@ -28,6 +28,7 @@ CONFIG_MEMORY_START=0c000000
# #
# General setup # General setup
# #
# CONFIG_ISA is not set
# CONFIG_NET is not set # CONFIG_NET is not set
CONFIG_CF_ENABLER=y CONFIG_CF_ENABLER=y
# CONFIG_PCI is not set # CONFIG_PCI is not set
...@@ -39,12 +40,18 @@ CONFIG_KCORE_ELF=y ...@@ -39,12 +40,18 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set # CONFIG_BINFMT_MISC is not set
#
# Parallel port support
#
# CONFIG_PARPORT is not set # CONFIG_PARPORT is not set
# #
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# #
# Additional Block Devices # Additional Block Devices
...@@ -53,21 +60,25 @@ CONFIG_BINFMT_ELF=y ...@@ -53,21 +60,25 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_MD is not set
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# #
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
# #
CONFIG_IDE=y CONFIG_IDE=y
#
# IDE, ATA and ATAPI Block devices
#
CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDE=y
# #
# Please see Documentation/ide.txt for help/info on IDE drives # Please see Documentation/ide.txt for help/info on IDE drives
# #
# CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_IDEDISK_MULTI_MODE is not set
# CONFIG_BLK_DEV_IDECS is not set
# CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set
...@@ -77,9 +88,11 @@ CONFIG_BLK_DEV_IDEDISK=y ...@@ -77,9 +88,11 @@ CONFIG_BLK_DEV_IDEDISK=y
# IDE chipset support/bugfixes # IDE chipset support/bugfixes
# #
# CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
# CONFIG_BLK_DEV_ISAPNP is not set
# CONFIG_IDE_CHIPSETS is not set # CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_BLK_DEV_IDE_MODES is not set # CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
# #
# SCSI support # SCSI support
...@@ -101,13 +114,20 @@ CONFIG_SERIAL_CONSOLE=y ...@@ -101,13 +114,20 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_UNIX98_PTYS is not set # CONFIG_UNIX98_PTYS is not set
# #
# Filesystems # File systems
# #
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set # CONFIG_AUTOFS4_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set # CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_FAT_FS is not set # CONFIG_FAT_FS is not set
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set # CONFIG_CRAMFS is not set
# CONFIG_ISO9660_FS is not set # CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set # CONFIG_JOLIET is not set
...@@ -115,6 +135,10 @@ CONFIG_SERIAL_CONSOLE=y ...@@ -115,6 +135,10 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set # CONFIG_SYSV_FS is not set
......
...@@ -36,6 +36,8 @@ bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4 ...@@ -36,6 +36,8 @@ bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4
if [ "$CONFIG_SUN4" != "y" ]; then if [ "$CONFIG_SUN4" != "y" ]; then
bool 'Support for PCI and PS/2 keyboard/mouse' CONFIG_PCI bool 'Support for PCI and PS/2 keyboard/mouse' CONFIG_PCI
source drivers/pci/Config.in source drivers/pci/Config.in
else
define_bool CONFIG_PCI n
fi fi
tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS
......
# $Id: config.in,v 1.104 2000/03/15 15:02:28 jj Exp $ # $Id: config.in,v 1.105 2000/03/24 00:34:11 davem Exp $
# For a description of the syntax of this configuration file, # For a description of the syntax of this configuration file,
# see the Configure script. # see the Configure script.
# #
...@@ -29,6 +29,7 @@ define_bool CONFIG_SUN_KEYBOARD y ...@@ -29,6 +29,7 @@ define_bool CONFIG_SUN_KEYBOARD y
define_bool CONFIG_SUN_CONSOLE y define_bool CONFIG_SUN_CONSOLE y
define_bool CONFIG_SUN_AUXIO y define_bool CONFIG_SUN_AUXIO y
define_bool CONFIG_SUN_IO y define_bool CONFIG_SUN_IO y
define_bool CONFIG_ISA n
bool 'PCI support' CONFIG_PCI bool 'PCI support' CONFIG_PCI
source drivers/pci/Config.in source drivers/pci/Config.in
...@@ -230,6 +231,7 @@ if [ "$CONFIG_NET" = "y" ]; then ...@@ -230,6 +231,7 @@ if [ "$CONFIG_NET" = "y" ]; then
tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
tristate 'RealTek RTL-8139 support' CONFIG_8139TOO tristate 'RealTek RTL-8139 support' CONFIG_8139TOO
tristate 'PCI NE2000 support' CONFIG_NE2K_PCI tristate 'PCI NE2000 support' CONFIG_NE2K_PCI
tristate 'VIA Rhine support' CONFIG_VIA_RHINE
tristate 'EtherExpressPro/100 support' CONFIG_EEPRO100 tristate 'EtherExpressPro/100 support' CONFIG_EEPRO100
tristate 'Adaptec Starfire support' CONFIG_ADAPTEC_STARFIRE tristate 'Adaptec Starfire support' CONFIG_ADAPTEC_STARFIRE
fi fi
......
...@@ -24,6 +24,7 @@ CONFIG_SUN_KEYBOARD=y ...@@ -24,6 +24,7 @@ CONFIG_SUN_KEYBOARD=y
CONFIG_SUN_CONSOLE=y CONFIG_SUN_CONSOLE=y
CONFIG_SUN_AUXIO=y CONFIG_SUN_AUXIO=y
CONFIG_SUN_IO=y CONFIG_SUN_IO=y
# CONFIG_ISA is not set
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_NAMES=y CONFIG_PCI_NAMES=y
CONFIG_SUN_OPENPROMFS=m CONFIG_SUN_OPENPROMFS=m
...@@ -218,7 +219,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y ...@@ -218,7 +219,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set # CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_IDEDMA_PCI_AUTO=y CONFIG_IDEDMA_PCI_AUTO=y
CONFIG_BLK_DEV_IDEDMA=y CONFIG_BLK_DEV_IDEDMA=y
CONFIG_IDEDMA_AUTO=y
CONFIG_IDEDMA_PCI_EXPERIMENTAL=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
# CONFIG_IDEDMA_PCI_WIP is not set # CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set # CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
...@@ -245,6 +245,7 @@ CONFIG_BLK_DEV_NS87415=y ...@@ -245,6 +245,7 @@ CONFIG_BLK_DEV_NS87415=y
# CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_IDE_CHIPSETS is not set # CONFIG_IDE_CHIPSETS is not set
CONFIG_IDEDMA_AUTO=y
CONFIG_BLK_DEV_IDE_MODES=y CONFIG_BLK_DEV_IDE_MODES=y
# #
...@@ -336,6 +337,7 @@ CONFIG_TULIP=m ...@@ -336,6 +337,7 @@ CONFIG_TULIP=m
CONFIG_VORTEX=m CONFIG_VORTEX=m
CONFIG_8139TOO=m CONFIG_8139TOO=m
CONFIG_NE2K_PCI=m CONFIG_NE2K_PCI=m
CONFIG_VIA_RHINE=m
CONFIG_EEPRO100=m CONFIG_EEPRO100=m
CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE=m
......
/* $Id: sys_sparc32.c,v 1.140 2000/03/22 02:44:35 davem Exp $ /* $Id: sys_sparc32.c,v 1.141 2000/03/24 01:31:30 davem Exp $
* sys_sparc32.c: Conversion between 32bit and 64bit native syscalls. * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls.
* *
* Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
...@@ -4144,7 +4144,7 @@ asmlinkage long sparc32_open(const char * filename, int flags, int mode) ...@@ -4144,7 +4144,7 @@ asmlinkage long sparc32_open(const char * filename, int flags, int mode)
if (fd >= 0) { if (fd >= 0) {
struct file * f; struct file * f;
lock_kernel(); lock_kernel();
f = filp_open(tmp, flags, mode); f = filp_open(tmp, flags, mode, NULL);
unlock_kernel(); unlock_kernel();
error = PTR_ERR(f); error = PTR_ERR(f);
if (IS_ERR(f)) if (IS_ERR(f))
......
/* $Id: memcmp.S,v 1.2 1997/04/01 03:43:18 davem Exp $ /* $Id: memcmp.S,v 1.3 2000/03/23 07:51:08 davem Exp $
* Sparc64 optimized memcmp code. * Sparc64 optimized memcmp code.
* *
* Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
* Copyright (C) 2000 David S. Miller (davem@redhat.com)
*/ */
.text .text
.align 4 .align 32
.globl __memcmp, memcmp .globl __memcmp, memcmp
__memcmp: __memcmp:
memcmp: memcmp:
brlez,pn %o2, 2f cmp %o2, 0 ! IEU1 Group
sub %g0, %o2, %o3 loop: be,pn %icc, ret_0 ! CTI
add %o0, %o2, %o0 nop ! IEU0
add %o1, %o2, %o1 ldub [%o0], %g5 ! LSU Group
ldub [%o0 + %o3], %o4 ldub [%o1], %g3 ! LSU Group
1: sub %o2, 1, %o2 ! IEU0
ldub [%o1 + %o3], %o5 add %o0, 1, %o0 ! IEU1
sub %o4, %o5, %o4 add %o1, 1, %o1 ! IEU0 Group
brnz,pn %o4, 3f subcc %g5, %g3, %g3 ! IEU1 Group
addcc %o3, 1, %o3 be,pt %icc, loop ! CTI
bne,a,pt %xcc, 1b cmp %o2, 0 ! IEU1 Group
ldub [%o0 + %o3], %o4
2: ret_n0: retl
retl mov %g3, %o0
clr %o0 ret_0: retl
3: mov 0, %o0
retl
mov %o4, %o0
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
......
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -44,15 +44,12 @@ ...@@ -44,15 +44,12 @@
#include <linux/param.h> #include <linux/param.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/locks.h> #include <linux/locks.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/malloc.h> #include <linux/malloc.h>
#include <linux/stat.h>
#include <linux/tty.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
This diff is collapsed.
...@@ -1315,8 +1315,8 @@ static __u8 root_hub_dev_des[] = ...@@ -1315,8 +1315,8 @@ static __u8 root_hub_dev_des[] =
0x00, /* __u16 bcdDevice; */ 0x00, /* __u16 bcdDevice; */
0x00, 0x00,
0x00, /* __u8 iManufacturer; */ 0x00, /* __u8 iManufacturer; */
0x00, /* __u8 iProduct; */ 0x02, /* __u8 iProduct; */
0x00, /* __u8 iSerialNumber; */ 0x01, /* __u8 iSerialNumber; */
0x01 /* __u8 bNumConfigurations; */ 0x01 /* __u8 bNumConfigurations; */
}; };
...@@ -1617,7 +1617,13 @@ static int rh_submit_urb(urb_t *urb) ...@@ -1617,7 +1617,13 @@ static int rh_submit_urb(urb_t *urb)
memcpy (data, root_hub_config_des, len); memcpy (data, root_hub_config_des, len);
OK(len); OK(len);
case 0x03: /* string descriptors */ case 0x03: /* string descriptors */
stat = -EPIPE; len = usb_root_hub_string (wValue & 0xff,
uhci->io_addr, "UHCI",
data, wLength);
if (len > 0) {
OK (min (leni, len));
} else
stat = -EPIPE;
} }
break; break;
case RH_GET_DESCRIPTOR | RH_CLASS: case RH_GET_DESCRIPTOR | RH_CLASS:
......
...@@ -339,10 +339,11 @@ static int sohci_submit_urb (urb_t * urb) ...@@ -339,10 +339,11 @@ static int sohci_submit_urb (urb_t * urb)
(le16_to_cpu (ohci->hcca.frame_no) + 10)) & 0xffff; (le16_to_cpu (ohci->hcca.frame_no) + 10)) & 0xffff;
} }
td_submit_urb (urb); /* fill the TDs and link it to the ed */
if (ed->state != ED_OPER) /* link the ed into a chain if is not already */ if (ed->state != ED_OPER) /* link the ed into a chain if is not already */
ep_link (ohci, ed); ep_link (ohci, ed);
td_submit_urb (urb); /* fill the TDs and link it to the ed */
spin_unlock_irqrestore (&usb_ed_lock, flags); spin_unlock_irqrestore (&usb_ed_lock, flags);
urb->status = USB_ST_URB_PENDING; urb->status = USB_ST_URB_PENDING;
...@@ -1128,8 +1129,8 @@ static __u8 root_hub_dev_des[] = ...@@ -1128,8 +1129,8 @@ static __u8 root_hub_dev_des[] =
0x00, /* __u16 bcdDevice; */ 0x00, /* __u16 bcdDevice; */
0x00, 0x00,
0x00, /* __u8 iManufacturer; */ 0x00, /* __u8 iManufacturer; */
0x00, /* __u8 iProduct; */ 0x02, /* __u8 iProduct; */
0x00, /* __u8 iSerialNumber; */ 0x01, /* __u8 iSerialNumber; */
0x01 /* __u8 bNumConfigurations; */ 0x01 /* __u8 bNumConfigurations; */
}; };
...@@ -1388,6 +1389,14 @@ static int rh_submit_urb (urb_t * urb) ...@@ -1388,6 +1389,14 @@ static int rh_submit_urb (urb_t * urb)
len = min (leni, min (sizeof (root_hub_config_des), wLength)); len = min (leni, min (sizeof (root_hub_config_des), wLength));
data_buf = root_hub_config_des; OK(len); data_buf = root_hub_config_des; OK(len);
case (0x03): /* string descriptors */ case (0x03): /* string descriptors */
len = usb_root_hub_string (wValue & 0xff,
(int) ohci->regs, "OHCI",
data, wLength);
if (len > 0) {
data_buf = data;
OK (min (leni, len));
}
// else fallthrough
default: default:
status = TD_CC_STALL; status = TD_CC_STALL;
} }
...@@ -1436,7 +1445,8 @@ static int rh_submit_urb (urb_t * urb) ...@@ -1436,7 +1445,8 @@ static int rh_submit_urb (urb_t * urb)
dbg("USB HC roothubstat2: %x", readl ( &(ohci->regs->roothub.portstatus[1]) )); dbg("USB HC roothubstat2: %x", readl ( &(ohci->regs->roothub.portstatus[1]) ));
len = min(len, leni); len = min(len, leni);
memcpy (data, data_buf, len); if (data != data_buf)
memcpy (data, data_buf, len);
urb->actual_length = len; urb->actual_length = len;
urb->status = cc_to_error [status]; urb->status = cc_to_error [status];
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -269,6 +269,8 @@ void shrink_dcache_sb(struct super_block * sb) ...@@ -269,6 +269,8 @@ void shrink_dcache_sb(struct super_block * sb)
struct list_head *tmp, *next; struct list_head *tmp, *next;
struct dentry *dentry; struct dentry *dentry;
check_lock();
/* /*
* Pass one ... move the dentries for the specified * Pass one ... move the dentries for the specified
* superblock to the most recent end of the unused list. * superblock to the most recent end of the unused list.
...@@ -316,6 +318,8 @@ int is_root_busy(struct dentry *root) ...@@ -316,6 +318,8 @@ int is_root_busy(struct dentry *root)
struct list_head *next; struct list_head *next;
int count = root->d_count; int count = root->d_count;
check_lock();
repeat: repeat:
next = this_parent->d_subdirs.next; next = this_parent->d_subdirs.next;
resume: resume:
...@@ -395,6 +399,8 @@ static int select_parent(struct dentry * parent) ...@@ -395,6 +399,8 @@ static int select_parent(struct dentry * parent)
struct list_head *next; struct list_head *next;
int found = 0; int found = 0;
check_lock();
repeat: repeat:
next = this_parent->d_subdirs.next; next = this_parent->d_subdirs.next;
resume: resume:
...@@ -657,6 +663,8 @@ void d_delete(struct dentry * dentry) ...@@ -657,6 +663,8 @@ void d_delete(struct dentry * dentry)
{ {
check_lock(); check_lock();
check_lock();
/* /*
* Are we the only user? * Are we the only user?
*/ */
......
This diff is collapsed.
This diff is collapsed.
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#define NFS_NEED_XDR_TYPES #define NFS_NEED_XDR_TYPES
#include <linux/config.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment