- dep_tristate 'Apple Desktop Bus mouse support' CONFIG_ADBMOUSE
$CONFIG_BUSMOUSE
+ if [ "$CONFIG_PPC" = "y" ; then
+ dep_tristate 'Apple Desktop Bus mouse support' CONFIG_ADBMOUSE
$CONFIG_BUSMOUSE
+ fi
Hmmm. Shouldn't ADB mouse support be available on 68k Macs as well?
+CONFIG_ISA=y
This should either be a config-option, or made dependant on something
else, as MCA-machines never has an ISA-bus too... (There are the MCA+PCI
machines IBM made of course, but they are another story.)
+ dep_tristate 'USB HP scanner support' CONFIG_USB_HP_SCANNER $CONFIG_USB
If I interpret this correctly, this is support for a driver for a specific
vendor. Wouldn't it be more correct to have a generic "USB scanner
support" option, and then have the HP-option depending on this one? Even
if the USB scanner support option itself is a dummy one (that is, the
scanners share no common code) this would be more consistent
with the rest of the config-options in the kernel.
I've moved around some stuff in the USB-menu and added some comments, to
make it cleaner.
This patch also removes the EXPERIMENTAL flag from the 3c523 & 3c527
drivers (they are known to work well), and the EXPERIMENTAL-text from the
drivers that are not inside EXPERIMENTAL if's, and adds (EXPERIMENTAL)
for drivers that are inside such if's. After all, either a driver is
experimental, or it isn't...
I also moved AT1700/AT1720 out of 'Other ISA cards', together with DEPCA,
as both of these adapters support MCA as well, and added a separate
submenu for Wireless LAN.
A question: why is the IBM lanstreamer out-commented? Is it non-working?
I've also cleaned up some smaller things in the drivers/char menu; for
instance I considered it VERY strange that Iomega Buz & Zoran
ZR30657/36060 options should be inside the if-statement for QIC-02 tape
support... I moved them out of there and into Video for Linux, where they
probably belong.
An idea would be to mark all unfixed filesystems as dangerous and
'if' them to experimental, until they have been rewritten. I don't know
which filesystems are clean and which aren't, though.
Considering the number of naughty bugs the slab-poisoning in the
AC-patches in the v2.2-series found, wouldn't it be nice to have the
slab-poisoning a resident part of the kernel-source, as a config-option
under Kernel-Hacking?
Oh, and wouldn't it be more logical to have both Maximum phys-mem and
BIGMEM in the same menu? Or even better, remove one of the options...
When compiling the kernel, I get the following warnings; some of them are
long-standing, others are new from v2.3.16.
sched.c:124: warning: alignment of `aligned_data' is greater than maximum
object file alignment
8390.c: In function `NS8390_trigger_send':
8390.c:1092: warning: unused variable `ei_local'
scsi.c:185: warning: `scsi_unregister_device' declared `static' but never
defined
/home/projects/mcalinux/mca/kernel/linux-2.3.17pre1/include/linux/blk.h:400:
warning: `do_sd' defined but not used
/home/projects/mcalinux/mca/kernel/linux-2.3.17pre1/include/linux/blk.h:424:
warning: `do_sd_request' declared `static' but never defined
scsi.h:637: warning: `end_scsi_request' defined but not used
irq.c:78: warning: alignment of `irq_desc' is greater than maximum object
file alignment
setup.c: In function `setup_arch':
setup.c:536: warning: int format, long int arg (arg 2)
setup.c:536: warning: unsigned int format, different type arg (arg 3)
setup.c:536: warning: unsigned int format, different type arg (arg 4)
init_task.c:33: warning: alignment of `init_tss' is greater than maximum
object file alignment
All in all, however, it seems really promising. I like the idea of seeing
PCMCIA in the main kernel tree; now only NFS v3, devfs and IKD (or
similar) is left to go before *I* am pleased (oh, and a sound-driver
for IBM ACPA/A of course, but I'll hack that one up myself, hopefully)...
Something similar to my patches should probably go into v2.2.x as well,
but for natural reasons (different feature subset), these patches won't
apply. If I get clearance, I'll submit a v2.2.x patch as well.
/David Weinehall
_ _
// David Weinehall <tao@acc.umu.se> /> Northern lights wander \\
// Project MCA Linux hacker // Dance across the winter sky //
\> http://www.acc.umu.se/~tao/ </ Full colour fire </
--- linux/drivers/char/Config.in Sat Sep 4 17:09:24 1999
+++ linuxd/drivers/char/Config.in Sat Sep 4 15:47:52 1999
@@ -6,119 +6,118 @@
bool 'Virtual terminal' CONFIG_VT
if [ "$CONFIG_VT" = "y" ]; then
- bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
+ bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
fi
tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
if [ "$CONFIG_SERIAL" = "y" ]; then
- bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
+ bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
fi
bool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED
if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
- bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
- bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
- bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ
- bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT
- bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6
+ bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
+ bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
+ bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ
+ bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT
+ bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6
fi
bool 'Non-standard serial port support' CONFIG_SERIAL_NONSTANDARD
if [ "$CONFIG_SERIAL_NONSTANDARD" = "y" ]; then
- tristate 'Comtrol Rocketport support' CONFIG_ROCKETPORT
- tristate 'Digiboard Intelligent Async Support' CONFIG_DIGIEPCA
+ tristate ' Comtrol Rocketport support' CONFIG_ROCKETPORT
+ tristate ' Digiboard Intelligent Async Support' CONFIG_DIGIEPCA
if [ "$CONFIG_DIGIEPCA" = "n" ]; then
- tristate 'Digiboard PC/Xx Support' CONFIG_DIGI
+ tristate ' Digiboard PC/Xx Support' CONFIG_DIGI
fi
- tristate 'Cyclades async mux support' CONFIG_CYCLADES
+ tristate ' Cyclades async mux support' CONFIG_CYCLADES
if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_CYCLADES" != "n" ]; then
- bool ' Cyclades-Z interrupt mode operation (EXPERIMENTAL)' CONFIG_CYZ_INTR
+ bool ' Cyclades-Z interrupt mode operation (EXPERIMENTAL)' CONFIG_CYZ_INTR
fi
- bool 'Stallion multiport serial support' CONFIG_STALDRV
+ bool ' Stallion multiport serial support' CONFIG_STALDRV
if [ "$CONFIG_STALDRV" = "y" ]; then
- tristate ' Stallion EasyIO or EC8/32 support' CONFIG_STALLION
- tristate ' Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION
+ tristate ' Stallion EasyIO or EC8/32 support' CONFIG_STALLION
+ tristate ' Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION
fi
- tristate 'SDL RISCom/8 card support' CONFIG_RISCOM8
- tristate 'Computone IntelliPort Plus serial support' CONFIG_COMPUTONE
- tristate 'Specialix IO8+ card support' CONFIG_SPECIALIX
+ tristate ' SDL RISCom/8 card support' CONFIG_RISCOM8
+ tristate ' Computone IntelliPort Plus serial support' CONFIG_COMPUTONE
+ tristate ' Specialix IO8+ card support' CONFIG_SPECIALIX
if [ "$CONFIG_SPECIALIX" != "n" ]; then
- bool 'Specialix DTR/RTS pin is RTS' CONFIG_SPECIALIX_RTSCTS
+ bool ' Specialix DTR/RTS pin is RTS' CONFIG_SPECIALIX_RTSCTS
fi
- tristate 'Specialix SX (and SI) card support' CONFIG_SX
- tristate 'Hayes ESP serial port support' CONFIG_ESPSERIAL
+ tristate ' Specialix SX (and SI) card support' CONFIG_SX
+ tristate ' Hayes ESP serial port support' CONFIG_ESPSERIAL
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- dep_tristate 'Multi-Tech multiport card support' CONFIG_ISI m
+ dep_tristate ' Multi-Tech multiport card support (EXPERIMENTAL)' CONFIG_ISI m
fi
- dep_tristate 'Microgate SyncLink card support' CONFIG_SYNCLINK m
- dep_tristate 'HDLC line discipline support' CONFIG_N_HDLC m
+ dep_tristate ' Microgate SyncLink card support' CONFIG_SYNCLINK m
+ dep_tristate ' HDLC line discipline support' CONFIG_N_HDLC m
fi
bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
- int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
+ int ' Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
fi
if [ "$CONFIG_PARPORT" != "n" ]; then
- dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
- if [ "$CONFIG_PRINTER" != "n" ]; then
- bool ' Support for console on line printer' CONFIG_LP_CONSOLE
- fi
- dep_tristate 'Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
+ dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
+ if [ "$CONFIG_PRINTER" != "n" ]; then
+ bool ' Support for console on line printer' CONFIG_LP_CONSOLE
+ fi
+ dep_tristate ' Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
fi
mainmenu_option next_comment
comment 'Mice'
tristate 'Bus Mouse Support' CONFIG_BUSMOUSE
if [ "$CONFIG_BUSMOUSE" != "n" ]; then
- dep_tristate 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE $CONFIG_BUSMOUSE
- dep_tristate 'Logitech busmouse support' CONFIG_LOGIBUSMOUSE $CONFIG_BUSMOUSE
- dep_tristate 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE $CONFIG_BUSMOUSE
- if [ "$CONFIG_PPC" = "y" ; then
- dep_tristate 'Apple Desktop Bus mouse support' CONFIG_ADBMOUSE $CONFIG_BUSMOUSE
- fi
+ dep_tristate ' ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE $CONFIG_BUSMOUSE
+ dep_tristate ' Logitech busmouse support' CONFIG_LOGIBUSMOUSE $CONFIG_BUSMOUSE
+ dep_tristate ' Microsoft busmouse support' CONFIG_MS_BUSMOUSE $CONFIG_BUSMOUSE
+ if [ "$CONFIG_PPC" = "y" ; then
+ dep_tristate ' Apple Desktop Bus mouse support' CONFIG_ADBMOUSE $CONFIG_BUSMOUSE
+ fi
fi
tristate 'Mouse Support (not serial and bus mice)' CONFIG_MOUSE
if [ "$CONFIG_MOUSE" != "n" ]; then
- bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE
- tristate 'C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE
- tristate 'PC110 digitizer pad support' CONFIG_PC110_PAD
+ bool ' PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE
+ tristate ' C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE
+ tristate ' PC110 digitizer pad support' CONFIG_PC110_PAD
fi
endmenu
tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
- bool 'Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
- if [ "$CONFIG_QIC02_DYNCONF" != "y" ]; then
- comment ' Edit configuration parameters in ./include/linux/tpqic02.h!'
- else
- comment ' Setting runtime QIC-02 configuration is done with qic02conf'
- comment ' from the tpqic02-support package. It is available at'
- comment ' metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/'
- fi
- dep_tristate 'Zoran ZR36057/36060 support' CONFIG_VIDEO_ZORAN $CONFIG_VIDEO_DEV
- dep_tristate ' Include support for Iomega Buz' CONFIG_VIDEO_BUZ $CONFIG_VIDEO_ZORAN
+ bool ' Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
+ if [ "$CONFIG_QIC02_DYNCONF" != "y" ]; then
+ comment ' Edit configuration parameters in ./include/linux/tpqic02.h!'
+ else
+ comment ' Setting runtime QIC-02 configuration is done with qic02conf'
+ comment ' from the tpqic02-support package. It is available at'
+ comment ' metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/'
+ fi
fi
-bool 'Watchdog Timer Support' CONFIG_WATCHDOG
+mainmenu_option next_comment
+comment 'Watchdog Cards'
+
+bool 'Watchdog Timer Support' CONFIG_WATCHDOG
if [ "$CONFIG_WATCHDOG" != "n" ]; then
- mainmenu_option next_comment
- comment 'Watchdog Cards'
- bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
- tristate ' WDT Watchdog timer' CONFIG_WDT
- if [ "$CONFIG_WDT" != "n" ]; then
- bool ' WDT501 features' CONFIG_WDT_501
- if [ "$CONFIG_WDT_501" = "y" ]; then
- bool ' Fan Tachometer' CONFIG_WDT_501_FAN
- fi
- fi
- tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG
- tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG
- tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT
- endmenu
+ bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
+ tristate ' WDT Watchdog timer' CONFIG_WDT
+ if [ "$CONFIG_WDT" != "n" ]; then
+ bool ' WDT501 features' CONFIG_WDT_501
+ if [ "$CONFIG_WDT_501" = "y" ]; then
+ bool ' Fan Tachometer' CONFIG_WDT_501_FAN
+ fi
+ fi
+ tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG
+ tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG
+ tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT
fi
+endmenu
tristate '/dev/nvram support' CONFIG_NVRAM
bool 'Enhanced Real Time Clock Support' CONFIG_RTC
if [ "$CONFIG_ALPHA_BOOK1" = "y" ]; then
- bool 'Tadpole ANA H8 Support' CONFIG_H8
+ bool 'Tadpole ANA H8 Support' CONFIG_H8
fi
mainmenu_option next_comment
@@ -126,64 +125,66 @@
tristate 'Video For Linux' CONFIG_VIDEO_DEV
if [ "$CONFIG_VIDEO_DEV" != "n" ]; then
- dep_tristate 'ADS Cadet AM/FM Tuner' CONFIG_RADIO_CADET $CONFIG_VIDEO_DEV
- dep_tristate 'AIMSlab RadioTrack (aka RadioReveal) support' CONFIG_RADIO_RTRACK $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_RTRACK" = "y" ]; then
- hex ' RadioTrack i/o port (0x20f or 0x30f)' CONFIG_RADIO_RTRACK_PORT 20f
- fi
- dep_tristate 'AIMSlab RadioTrack II support' CONFIG_RADIO_RTRACK2 $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_RTRACK2" = "y" ]; then
- hex ' RadioTrack II i/o port (0x20c or 0x30c)' CONFIG_RADIO_RTRACK2_PORT 30c
- fi
- dep_tristate 'Aztech/Packard Bell Radio' CONFIG_RADIO_AZTECH $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_AZTECH" = "y" ]; then
- hex ' Aztech/Packard Bell I/O port (0x350 or 0x358)' CONFIG_RADIO_AZTECH_PORT 350
- fi
- dep_tristate 'GemTek Radio Card support' CONFIG_RADIO_GEMTEK $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_GEMTEK" = "y" ]; then
- hex ' GemTek i/o port (0x20c, 0x30c, 0x24c or 0x34c)' CONFIG_RADIO_GEMTEK_PORT 34c
- fi
- dep_tristate 'Miro PCM20 Radio' CONFIG_RADIO_MIROPCM20 $CONFIG_VIDEO_DEV
- dep_tristate 'TerraTec ActiveRadio ISA Standalone' CONFIG_RADIO_TERRATEC $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_TERRATEC" = "y" ]; then
- hex ' Terratec i/o port (normally 0x590)' CONFIG_RADIO_TERRATEC_PORT 590
- fi
- if [ "$CONFIG_PCI" != "n" ]; then
- dep_tristate 'BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV
- fi
- if [ "$CONFIG_PARPORT" != "n" ]; then
- dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
- dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
- fi
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- if [ "$CONFIG_SGI" = "y" ]; then
- dep_tristate 'SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV
- fi
- fi
- dep_tristate 'Mediavision Pro Movie Studio Video For Linux' CONFIG_VIDEO_PMS $CONFIG_VIDEO_DEV
- if [ "$CONFIG_PMAC" = "y" ]; then
- dep_tristate 'PlanB Video-In on PowerMac' CONFIG_VIDEO_PLANB $CONFIG_VIDEO_DEV
- fi
- dep_tristate 'SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV
- dep_tristate 'SF16FMI Radio' CONFIG_RADIO_SF16FMI $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_SF16FMI" = "y" ]; then
- hex ' SF16FMI I/O port (0x284 or 0x384)' CONFIG_RADIO_SF16FMI_PORT 284
- fi
- dep_tristate 'Typhoon Radio (a.k.a. EcoRadio)' CONFIG_RADIO_TYPHOON $CONFIG_VIDEO_DEV
- if [ "$CONFIG_PROC_FS" = "y" ]; then
+ dep_tristate ' ADS Cadet AM/FM Tuner' CONFIG_RADIO_CADET $CONFIG_VIDEO_DEV
+ dep_tristate ' AIMSlab RadioTrack (aka RadioReveal) support' CONFIG_RADIO_RTRACK $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_RTRACK" = "y" ]; then
+ hex ' RadioTrack i/o port (0x20f or 0x30f)' CONFIG_RADIO_RTRACK_PORT 20f
+ fi
+ dep_tristate ' AIMSlab RadioTrack II support' CONFIG_RADIO_RTRACK2 $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_RTRACK2" = "y" ]; then
+ hex ' RadioTrack II i/o port (0x20c or 0x30c)' CONFIG_RADIO_RTRACK2_PORT 30c
+ fi
+ dep_tristate ' Aztech/Packard Bell Radio' CONFIG_RADIO_AZTECH $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_AZTECH" = "y" ]; then
+ hex ' Aztech/Packard Bell I/O port (0x350 or 0x358)' CONFIG_RADIO_AZTECH_PORT 350
+ fi
+ dep_tristate ' GemTek Radio Card support' CONFIG_RADIO_GEMTEK $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_GEMTEK" = "y" ]; then
+ hex ' GemTek i/o port (0x20c, 0x30c, 0x24c or 0x34c)' CONFIG_RADIO_GEMTEK_PORT 34c
+ fi
+ dep_tristate ' Miro PCM20 Radio' CONFIG_RADIO_MIROPCM20 $CONFIG_VIDEO_DEV
+ dep_tristate ' TerraTec ActiveRadio ISA Standalone' CONFIG_RADIO_TERRATEC $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_TERRATEC" = "y" ]; then
+ hex ' Terratec i/o port (normally 0x590)' CONFIG_RADIO_TERRATEC_PORT 590
+ fi
+ if [ "$CONFIG_PCI" != "n" ]; then
+ dep_tristate ' BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV
+ fi
+ if [ "$CONFIG_PARPORT" != "n" ]; then
+ dep_tristate ' Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
+ dep_tristate ' Colour QuickCam Video For Linux' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
+ fi
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ if [ "$CONFIG_SGI" = "y" ]; then
+ dep_tristate ' SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV
+ fi
+ fi
+ dep_tristate ' Mediavision Pro Movie Studio Video For Linux' CONFIG_VIDEO_PMS $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_PMAC" = "y" ]; then
+ dep_tristate ' PlanB Video-In on PowerMac' CONFIG_VIDEO_PLANB $CONFIG_VIDEO_DEV
+ fi
+ dep_tristate ' SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV
+ dep_tristate ' SF16FMI Radio' CONFIG_RADIO_SF16FMI $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_SF16FMI" = "y" ]; then
+ hex ' SF16FMI I/O port (0x284 or 0x384)' CONFIG_RADIO_SF16FMI_PORT 284
+ fi
+ dep_tristate ' Typhoon Radio (a.k.a. EcoRadio)' CONFIG_RADIO_TYPHOON $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_PROC_FS" = "y" ]; then
if [ "$CONFIG_RADIO_TYPHOON" != "n" ]; then
- bool ' Support for /proc/radio-typhoon' CONFIG_RADIO_TYPHOON_PROC_FS
+ bool ' Support for /proc/radio-typhoon' CONFIG_RADIO_TYPHOON_PROC_FS
fi
- fi
- if [ "$CONFIG_RADIO_TYPHOON" = "y" ]; then
- hex ' Typhoon I/O port (0x316 or 0x336)' CONFIG_RADIO_TYPHOON_PORT 316
- int ' Typhoon frequency set when muting the device (kHz)' CONFIG_RADIO_TYPHOON_MUTEFREQ 87500
- fi
- dep_tristate 'Zoltrix Radio' CONFIG_RADIO_ZOLTRIX $CONFIG_VIDEO_DEV
- if [ "$CONFIG_RADIO_ZOLTRIX" = "y" ]; then
- hex ' ZOLTRIX I/O port (0x20c or 0x30c)' CONFIG_RADIO_ZOLTRIX_PORT 20c
- fi
- dep_tristate 'IIC on parallel port' CONFIG_I2C_PARPORT $CONFIG_PARPORT
+ fi
+ if [ "$CONFIG_RADIO_TYPHOON" = "y" ]; then
+ hex ' Typhoon I/O port (0x316 or 0x336)' CONFIG_RADIO_TYPHOON_PORT 316
+ int ' Typhoon frequency set when muting the device (kHz)' CONFIG_RADIO_TYPHOON_MUTEFREQ 87500
+ fi
+ dep_tristate ' Zoltrix Radio' CONFIG_RADIO_ZOLTRIX $CONFIG_VIDEO_DEV
+ if [ "$CONFIG_RADIO_ZOLTRIX" = "y" ]; then
+ hex ' ZOLTRIX I/O port (0x20c or 0x30c)' CONFIG_RADIO_ZOLTRIX_PORT 20c
+ fi
+ dep_tristate ' Zoran ZR36057/36060 support' CONFIG_VIDEO_ZORAN $CONFIG_VIDEO_DEV
+ dep_tristate ' Include support for Iomega Buz' CONFIG_VIDEO_BUZ $CONFIG_VIDEO_ZORAN
+ dep_tristate ' IIC on parallel port' CONFIG_I2C_PARPORT $CONFIG_PARPORT
fi
endmenu
@@ -193,7 +194,7 @@
tristate 'Joystick support' CONFIG_JOYSTICK
if [ "$CONFIG_JOYSTICK" != "n" ]; then
- source drivers/char/joystick/Config.in
+ source drivers/char/joystick/Config.in
fi
endmenu
@@ -206,7 +207,7 @@
comment 'Ftape, the floppy tape device driver'
tristate 'Ftape (QIC-80/Travan) support' CONFIG_FTAPE
if [ "$CONFIG_FTAPE" != "n" ]; then
- source drivers/char/ftape/Config.in
+ source drivers/char/ftape/Config.in
fi
endmenu
--- linux/drivers/char/joystick/Config.in Wed Dec 16 22:38:18 1998
+++ linuxd/drivers/char/joystick/Config.in Sat Sep 4 15:54:52 1999
@@ -2,18 +2,18 @@
# Joystick lowlevel driver configuration
#
-dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_JOY_ANALOG $CONFIG_JOYSTICK
-dep_tristate ' FPGaming and MadCatz A3D controllers' CONFIG_JOY_ASSASIN $CONFIG_JOYSTICK
-dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_JOY_GRAVIS $CONFIG_JOYSTICK
-dep_tristate ' Logitech Digital joysticks and gamepads' CONFIG_JOY_LOGITECH $CONFIG_JOYSTICK
-dep_tristate ' Microsoft SideWinder, Genius Digital joysticks and gamepads' CONFIG_JOY_SIDEWINDER $CONFIG_JOYSTICK
-dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_JOY_THRUSTMASTER $CONFIG_JOYSTICK
-dep_tristate ' PDPI Lightning 4 gamecards' CONFIG_JOY_LIGHTNING $CONFIG_JOYSTICK
+dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_JOY_ANALOG $CONFIG_JOYSTICK
+dep_tristate ' FPGaming and MadCatz A3D controllers' CONFIG_JOY_ASSASIN $CONFIG_JOYSTICK
+dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_JOY_GRAVIS $CONFIG_JOYSTICK
+dep_tristate ' Logitech Digital joysticks and gamepads' CONFIG_JOY_LOGITECH $CONFIG_JOYSTICK
+dep_tristate ' Microsoft SideWinder, Genius Digital joysticks and gamepads' CONFIG_JOY_SIDEWINDER $CONFIG_JOYSTICK
+dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_JOY_THRUSTMASTER $CONFIG_JOYSTICK
+dep_tristate ' PDPI Lightning 4 gamecards' CONFIG_JOY_LIGHTNING $CONFIG_JOYSTICK
if [ "$CONFIG_PARPORT" != "n" ]; then
- dep_tristate ' NES, SNES, PSX, Multisystem joysticks and gamepads' CONFIG_JOY_CONSOLE $CONFIG_JOYSTICK $CONFIG_PARPORT
- dep_tristate ' Sega, Multisystem joysticks and gamepads' CONFIG_JOY_DB9 $CONFIG_JOYSTICK $CONFIG_PARPORT
- dep_tristate ' TurboGraFX Multisystem joystick interface' CONFIG_JOY_TURBOGRAFX $CONFIG_JOYSTICK $CONFIG_PARPORT
+ dep_tristate ' NES, SNES, PSX, Multisystem joysticks and gamepads' CONFIG_JOY_CONSOLE $CONFIG_JOYSTICK $CONFIG_PARPORT
+ dep_tristate ' Sega, Multisystem joysticks and gamepads' CONFIG_JOY_DB9 $CONFIG_JOYSTICK $CONFIG_PARPORT
+ dep_tristate ' TurboGraFX Multisystem joystick interface' CONFIG_JOY_TURBOGRAFX $CONFIG_JOYSTICK $CONFIG_PARPORT
fi
if [ "$CONFIG_AMIGA" = "y" ]; then
- dep_tristate ' Amiga joysticks' CONFIG_JOY_AMIGA $CONFIG_JOYSTICK
+ dep_tristate ' Amiga joysticks' CONFIG_JOY_AMIGA $CONFIG_JOYSTICK
fi
--- linux/drivers/char/ftape/Config.in Tue Dec 2 22:47:33 1997
+++ linuxd/drivers/char/ftape/Config.in Sat Sep 4 15:52:15 1999
@@ -1,17 +1,17 @@
#
# Ftape configuration
#
-dep_tristate 'Zftape, the VFS interface' CONFIG_ZFTAPE $CONFIG_FTAPE
+dep_tristate ' Zftape, the VFS interface' CONFIG_ZFTAPE $CONFIG_FTAPE
if [ "$CONFIG_ZFTAPE" != "n" ]; then
- int 'Default block size' CONFIG_ZFT_DFLT_BLK_SZ 10240
- comment 'The compressor will be built as a module only!'
- define_bool CONFIG_ZFT_COMPRESSOR m
+ int ' Default block size' CONFIG_ZFT_DFLT_BLK_SZ 10240
+ comment ' The compressor will be built as a module only!'
+ define_bool CONFIG_ZFT_COMPRESSOR m
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- int 'Number of ftape buffers (EXPERIMENTAL)' CONFIG_FT_NR_BUFFERS 3
+ int ' Number of ftape buffers (EXPERIMENTAL)' CONFIG_FT_NR_BUFFERS 3
fi
if [ "$CONFIG_PROC_FS" = "y" ]; then
- bool 'Enable procfs status report (+2kb)' CONFIG_FT_PROC_FS y
+ bool ' Enable procfs status report (+2kb)' CONFIG_FT_PROC_FS y
fi
choice 'Debugging output' \
"Normal CONFIG_FT_NORMAL_DEBUG \
@@ -25,14 +25,14 @@
FC-10/FC-20 CONFIG_FT_PROBE_FC10 \
Alt/82078 CONFIG_FT_ALT_FDC" Standard
if [ "$CONFIG_FT_STD_FDC" != "y" ]; then
- comment ' Consult the manuals of your tape drive for the correct settings!'
- hex ' IO base of the floppy disk controller' CONFIG_FT_FDC_BASE 0
- int ' IRQ channel of the floppy disk controller' CONFIG_FT_FDC_IRQ 0
- int ' DMA channel of the floppy disk controller' CONFIG_FT_FDC_DMA 0
+ comment ' Consult the manuals of your tape drive for the correct settings!'
+ hex ' IO base of the floppy disk controller' CONFIG_FT_FDC_BASE 0
+ int ' IRQ channel of the floppy disk controller' CONFIG_FT_FDC_IRQ 0
+ int ' DMA channel of the floppy disk controller' CONFIG_FT_FDC_DMA 0
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- int 'Default FIFO threshold (EXPERIMENTAL)' CONFIG_FT_FDC_THR 8
- int 'Maximal data rate to use (EXPERIMENTAL)' CONFIG_FT_FDC_MAX_RATE 2000
+ int ' Default FIFO threshold (EXPERIMENTAL)' CONFIG_FT_FDC_THR 8
+ int ' Maximal data rate to use (EXPERIMENTAL)' CONFIG_FT_FDC_MAX_RATE 2000
fi
comment 'ONLY for DEC Alpha architectures'
-int 'CPU clock frequency of your DEC Alpha' CONFIG_FT_ALPHA_CLOCK 0
+int ' CPU clock frequency of your DEC Alpha' CONFIG_FT_ALPHA_CLOCK 0
--- linux/drivers/net/Config.in Mon Aug 23 19:10:29 1999
+++ linuxd/drivers/net/Config.in Sat Sep 4 15:12:49 1999
@@ -21,7 +21,7 @@
tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
if [ "$CONFIG_NETLINK" = "y" ]; then
- tristate 'Ethertap network tap' CONFIG_ETHERTAP
+ tristate 'Ethertap network tap (EXPERIMENTAL)' CONFIG_ETHERTAP
fi
fi
@@ -38,121 +38,121 @@
if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
if [ "$CONFIG_ARM" = "y" ]; then
if [ "$CONFIG_ARCH_ACORN" != "y" ]; then
- tristate 'AM79C961A support' CONFIG_ARM_AM79C961A
+ tristate ' AM79C961A support' CONFIG_ARM_AM79C961A
else
source drivers/acorn/net/Config.in
fi
fi
if [ "$CONFIG_PPC" = "y" ]; then
- tristate 'MACE (Power Mac ethernet) support' CONFIG_MACE
- tristate 'BMAC (G3 ethernet) support' CONFIG_BMAC
+ tristate ' MACE (Power Mac ethernet) support' CONFIG_MACE
+ tristate ' BMAC (G3 ethernet) support' CONFIG_BMAC
fi
if [ "$CONFIG_ZORRO" = "y" ]; then
- tristate 'Ariadne support' CONFIG_ARIADNE
- tristate 'Ariadne II support' CONFIG_ARIADNE2
- tristate 'A2065 support' CONFIG_A2065
- tristate 'Hydra support' CONFIG_HYDRA
+ tristate ' Ariadne support' CONFIG_ARIADNE
+ tristate ' Ariadne II support' CONFIG_ARIADNE2
+ tristate ' A2065 support' CONFIG_A2065
+ tristate ' Hydra support' CONFIG_HYDRA
fi
if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then
- tristate 'MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC
+ tristate ' MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC
fi
- bool '3COM cards' CONFIG_NET_VENDOR_3COM
+ bool ' 3COM cards' CONFIG_NET_VENDOR_3COM
if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
- tristate '3c501 support' CONFIG_EL1
- tristate '3c503 support' CONFIG_EL2
- tristate '3c505 support' CONFIG_ELPLUS
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate '3c507 support' CONFIG_EL16
- if [ "$CONFIG_MCA" = "y" ]; then
- tristate '3c523 support' CONFIG_ELMC
- tristate '3c527 support' CONFIG_ELMC_II
- fi
- fi
- tristate '3c509/3c579 support' CONFIG_EL3
- tristate '3c515 ISA Fast EtherLink' CONFIG_3C515
- tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
+ tristate ' 3c501 support' CONFIG_EL1
+ tristate ' 3c503 support' CONFIG_EL2
+ tristate ' 3c505 support' CONFIG_ELPLUS
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate ' 3c507 support (EXPERIMENTAL)' CONFIG_EL16
+ fi
+ if [ "$CONFIG_MCA" = "y" ]; then
+ tristate ' 3c523 support' CONFIG_ELMC
+ tristate ' 3c527 support' CONFIG_ELMC_II
+ fi
+ tristate ' 3c509/3c529 (MCA)/3c579 support' CONFIG_EL3
+ tristate ' 3c515 ISA Fast EtherLink' CONFIG_3C515
+ tristate ' 3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
fi
- tristate 'AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
- bool 'Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
+ tristate ' AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
+ bool ' Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then
- tristate 'WD80*3 support' CONFIG_WD80x3
+ tristate ' WD80*3 support' CONFIG_WD80x3
if [ "$CONFIG_MCA" = "y" ]; then
- tristate 'SMC Ultra MCA support' CONFIG_ULTRAMCA
+ tristate ' SMC Ultra MCA support' CONFIG_ULTRAMCA
fi
- tristate 'SMC Ultra support' CONFIG_ULTRA
- tristate 'SMC Ultra32 EISA support' CONFIG_ULTRA32
- tristate 'SMC 9194 support' CONFIG_SMC9194
+ tristate ' SMC Ultra support' CONFIG_ULTRA
+ tristate ' SMC Ultra32 EISA support' CONFIG_ULTRA32
+ tristate ' SMC 9194 support' CONFIG_SMC9194
fi
- bool 'Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
+ bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'NI5010 support' CONFIG_NI5010
+ tristate ' NI5010 support (EXPERIMENTAL)' CONFIG_NI5010
fi
- tristate 'NI5210 support' CONFIG_NI52
- tristate 'NI6510 support' CONFIG_NI65
+ tristate ' NI5210 support' CONFIG_NI52
+ tristate ' NI6510 support' CONFIG_NI65
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139
- tristate 'SiS 900 PCI Fast Ethernet Adapter support' CONFIG_SIS900
- tristate 'Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN
- fi
- bool 'Other ISA cards' CONFIG_NET_ISA
+ tristate ' RealTek 8129/8139 (not 8019/8029!) support (EXPERIMENTAL)' CONFIG_RTL8139
+ tristate ' SiS 900 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_SIS900
+ tristate ' Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN
+ fi
+ tristate ' AT1700/1720 support' CONFIG_AT1700
+ tristate ' DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
+ bool ' Other ISA cards' CONFIG_NET_ISA
if [ "$CONFIG_NET_ISA" = "y" ]; then
- tristate 'AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700
- tristate 'Cabletron E21xx support' CONFIG_E2100
- tristate 'DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
- tristate 'EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
- tristate 'EtherExpress 16 support' CONFIG_EEXPRESS
- tristate 'EtherExpressPro support' CONFIG_EEXPRESS_PRO
- tristate 'FMV-181/182/183/184 support' CONFIG_FMV18X
- tristate 'HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS
- tristate 'HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN
- tristate 'HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
+ tristate ' Cabletron E21xx support' CONFIG_E2100
+ tristate ' EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
+ tristate ' EtherExpress 16 support' CONFIG_EEXPRESS
+ tristate ' EtherExpressPro support' CONFIG_EEXPRESS_PRO
+ tristate ' FMV-181/182/183/184 support' CONFIG_FMV18X
+ tristate ' HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS
+ tristate ' HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN
+ tristate ' HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'ICL EtherTeam 16i/32 support' CONFIG_ETH16I
+ tristate ' ICL EtherTeam 16i/32 support (EXPERIMENTAL)' CONFIG_ETH16I
fi
- tristate 'NE2000/NE1000 support' CONFIG_NE2000
+ tristate ' NE2000/NE1000 support' CONFIG_NE2000
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'SEEQ8005 support (EXPERIMENTAL)' CONFIG_SEEQ8005
+ tristate ' SEEQ8005 support (EXPERIMENTAL)' CONFIG_SEEQ8005
fi
- bool 'SK_G16 support' CONFIG_SK_G16
+ bool ' SK_G16 support' CONFIG_SK_G16
fi
if [ "$CONFIG_MCA" = "y" ]; then
- tristate 'NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
- tristate 'SKnet MCA support' CONFIG_SKMC
+ tristate ' SKnet MCA support' CONFIG_SKMC
+ tristate ' NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
fi
- bool 'EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA
+ bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA
if [ "$CONFIG_NET_EISA" = "y" ]; then
- tristate 'AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
+ tristate ' AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC
- tristate 'Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
+ tristate ' Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support (EXPERIMENTAL)' CONFIG_ACENIC
+ tristate ' Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
fi
- tristate 'Apricot Xen-II on board Ethernet' CONFIG_APRICOT
- tristate 'CS89x0 support' CONFIG_CS89x0
- tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
- tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
- tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
- tristate 'EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100
+ tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT
+ tristate ' CS89x0 support' CONFIG_CS89x0
+ tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+ tristate ' DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
+ tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
+ tristate ' EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
- tristate 'Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
+ tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
+ tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
fi
- tristate 'PCI NE2000 support' CONFIG_NE2K_PCI
- tristate 'TI ThunderLAN support' CONFIG_TLAN
- tristate 'VIA Rhine support' CONFIG_VIA_RHINE
+ tristate ' PCI NE2000 support' CONFIG_NE2K_PCI
+ tristate ' TI ThunderLAN support' CONFIG_TLAN
+ tristate ' VIA Rhine support' CONFIG_VIA_RHINE
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
- tristate 'SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100
- bool 'Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
+ tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
+ tristate ' SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100
+ bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
fi
fi
- bool 'Pocket and portable adaptors' CONFIG_NET_POCKET
+ bool ' Pocket and portable adapters' CONFIG_NET_POCKET
if [ "$CONFIG_NET_POCKET" = "y" ]; then
- bool 'AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP
- tristate 'D-Link DE600 pocket adaptor support' CONFIG_DE600
- tristate 'D-Link DE620 pocket adaptor support' CONFIG_DE620
+ bool ' AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
+ tristate ' D-Link DE600 pocket adapter support' CONFIG_DE600
+ tristate ' D-Link DE620 pocket adapter support' CONFIG_DE620
fi
fi
@@ -160,15 +160,15 @@
bool 'FDDI driver support' CONFIG_FDDI
if [ "$CONFIG_FDDI" = "y" ]; then
- bool 'Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
+ bool ' Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
if [ "$CONFIG_HIPPI" = "y" ]; then
- tristate 'Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER
+ tristate ' Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER
if [ "$CONFIG_ROADRUNNER" != "n" ]; then
- bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
+ bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
fi
fi
fi
@@ -200,42 +200,47 @@
tristate 'PPP (point-to-point protocol) support' CONFIG_PPP
if [ ! "$CONFIG_PPP" = "n" ]; then
- dep_tristate 'PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP
- dep_tristate 'PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
- dep_tristate 'PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP m
+ dep_tristate ' PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP
+ dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
+ dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP m
fi
tristate 'SLIP (serial line) support' CONFIG_SLIP
if [ "$CONFIG_SLIP" != "n" ]; then
- bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED
- bool ' Keepalive and linefill' CONFIG_SLIP_SMART
- bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6
+ bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED
+ bool ' Keepalive and linefill' CONFIG_SLIP_SMART
+ bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6
fi
+mainmenu_option next_comment
+comment 'Wireless LAN (non-hamradio)'
+
bool 'Wireless LAN (non-hamradio)' CONFIG_NET_RADIO
if [ "$CONFIG_NET_RADIO" = "y" ]; then
- dep_tristate 'STRIP (Metricom starmode radio IP)' CONFIG_STRIP $CONFIG_INET
- tristate 'AT&T WaveLAN & DEC RoamAbout DS support' CONFIG_WAVELAN
- tristate 'Aironet Arlan 655 & IC2200 DS support' CONFIG_ARLAN
+ dep_tristate ' STRIP (Metricom starmode radio IP)' CONFIG_STRIP $CONFIG_INET
+ tristate ' AT&T WaveLAN & DEC RoamAbout DS support' CONFIG_WAVELAN
+ tristate ' Aironet Arlan 655 & IC2200 DS support' CONFIG_ARLAN
fi
+endmenu
+
mainmenu_option next_comment
comment 'Token ring devices'
bool 'Token Ring driver support' CONFIG_TR
if [ "$CONFIG_TR" = "y" ]; then
- tristate 'IBM Tropic chipset based adaptor support' CONFIG_IBMTR
-# tristate 'IBM Lanstreamer PCI adaptor support' CONFIG_IBMLS
- tristate 'IBM Olympic chipset PCI adapter support' CONFIG_IBMOL
- tristate 'SysKonnect adapter support' CONFIG_SKTR
+ tristate ' IBM Tropic chipset based adapter support' CONFIG_IBMTR
+# tristate ' IBM Lanstreamer PCI adapter support' CONFIG_IBMLS
+ tristate ' IBM Olympic chipset PCI adapter support' CONFIG_IBMOL
+ tristate ' SysKonnect adapter support' CONFIG_SKTR
fi
endmenu
bool 'Fibre Channel driver support' CONFIG_NET_FC
if [ "$CONFIG_NET_FC" = "y" ]; then
- tristate 'Interphase 5526 Tachyon chipset based adaptor support' CONFIG_IPHASE5526
+ tristate ' Interphase 5526 Tachyon chipset based adapter support' CONFIG_IPHASE5526
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
--- linux/drivers/net/Space.c Mon Aug 23 19:10:29 1999
+++ linuxd/drivers/net/Space.c Sat Sep 4 15:05:43 1999
@@ -288,10 +288,10 @@
/*
* ISA probes that touch addresses < 0x400 (including those that also
- * look for EISA/PCI cards in addition to ISA cards).
+ * look for EISA/PCI/MCA cards in addition to ISA cards).
*/
struct devprobe isa_probes[] __initdata = {
-#ifdef CONFIG_EL3 /* ISA, EISA (MCA someday) 3c5x9 */
+#ifdef CONFIG_EL3 /* ISA, EISA, MCA 3c5x9 */
{el3_probe, 0},
#endif
#ifdef CONFIG_HP100 /* ISA, EISA & PCI */
--- linux/drivers/usb/Config.in Sat Sep 4 17:09:38 1999
+++ linuxd/drivers/usb/Config.in Sat Sep 4 16:04:31 1999
@@ -10,39 +10,42 @@
tristate 'Support for USB (EXPERIMENTAL!)' CONFIG_USB
if [ ! "$CONFIG_USB" = "n" ]; then
- dep_tristate 'UHCI (intel PIIX4 and others) support' CONFIG_USB_UHCI \
+comment 'USB Controllers'
+ dep_tristate ' UHCI (Intel PIIX4 and others) support' CONFIG_USB_UHCI \
$CONFIG_USB
- dep_tristate 'OHCI (compaq and some others) support' CONFIG_USB_OHCI \
+ dep_tristate ' OHCI (Compaq and some others) support' CONFIG_USB_OHCI \
$CONFIG_USB
- if [ "$CONFIG_USB_OHCI" != "n" ]; then
- bool ' Enable tons of OHCI debugging output' CONFIG_USB_OHCI_DEBUG
- fi
- dep_tristate 'OHCI-HCD (other OHCI opt. Virt. Root Hub) support' \
+ if [ "$CONFIG_USB_OHCI" != "n" ]; then
+ bool ' Enable tons of OHCI debugging output' CONFIG_USB_OHCI_DEBUG
+ fi
+ dep_tristate ' OHCI-HCD (other OHCI opt. Virt. Root Hub) support' \
CONFIG_USB_OHCI_HCD $CONFIG_USB
- if [ "$CONFIG_USB_OHCI_HCD" != "n" ]; then
- bool ' OHCI-HCD Virtual Root Hub' CONFIG_USB_OHCI_VROOTHUB
- fi
+ if [ "$CONFIG_USB_OHCI_HCD" != "n" ]; then
+ bool ' OHCI-HCD Virtual Root Hub' CONFIG_USB_OHCI_VROOTHUB
+ fi
- bool 'Enable lots of ISOC debugging output' CONFIG_USB_DEBUG_ISOC
+comment 'Miscellaneous USB options'
+ bool ' Enable lots of ISOC debugging output' CONFIG_USB_DEBUG_ISOC
+ if [ "$CONFIG_PROC_FS" != "n" ]; then
+ bool ' Preliminary /proc/bus/usb support' CONFIG_USB_PROC
+ fi
+ dep_tristate ' EZUSB Firmware downloader' CONFIG_USB_EZUSB $CONFIG_USB
- dep_tristate 'USB hub support' CONFIG_USB_HUB $CONFIG_USB
- dep_tristate 'USB mouse support' CONFIG_USB_MOUSE $CONFIG_USB
- dep_tristate 'USB HP scanner support' CONFIG_USB_HP_SCANNER $CONFIG_USB
- dep_tristate 'USB keyboard support' CONFIG_USB_KBD $CONFIG_USB
- dep_tristate 'USB audio parsing support' CONFIG_USB_AUDIO $CONFIG_USB
- dep_tristate 'USB Communications Device Class (ACM) support' CONFIG_USB_ACM $CONFIG_USB
- dep_tristate 'USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
- dep_tristate 'USB CPiA Camera support' CONFIG_USB_CPIA $CONFIG_USB
- dep_tristate 'USB SCSI Support' CONFIG_USB_SCSI $CONFIG_USB
- if [ "$CONFIG_USB_SCSI" != "n" ]; then
- dep_tristate ' USB SCSI verbose debug' CONFIG_USB_SCSI_DEBUG $CONFIG_USB_SCSI
- fi
- dep_tristate 'EZUSB Firmware downloader' CONFIG_USB_EZUSB $CONFIG_USB
- dep_tristate 'USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
- if [ "$CONFIG_PROC_FS" != "n" ]; then
- bool 'Preliminary /proc/bus/usb support' CONFIG_USB_PROC
- fi
+comment 'USB Devices'
+ dep_tristate ' USB hub support' CONFIG_USB_HUB $CONFIG_USB
+ dep_tristate ' USB mouse support' CONFIG_USB_MOUSE $CONFIG_USB
+ dep_tristate ' USB HP scanner support' CONFIG_USB_HP_SCANNER $CONFIG_USB
+ dep_tristate ' USB keyboard support' CONFIG_USB_KBD $CONFIG_USB
+ dep_tristate ' USB audio parsing support' CONFIG_USB_AUDIO $CONFIG_USB
+ dep_tristate ' USB Communications Device Class (ACM) support' CONFIG_USB_ACM $CONFIG_USB
+ dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
+ dep_tristate ' USB CPiA Camera support' CONFIG_USB_CPIA $CONFIG_USB
+ dep_tristate ' USB SCSI Support' CONFIG_USB_SCSI $CONFIG_USB
+ if [ "$CONFIG_USB_SCSI" != "n" ]; then
+ dep_tristate ' USB SCSI verbose debug' CONFIG_USB_SCSI_DEBUG $CONFIG_USB_SCSI
+ fi
+ dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
fi
endmenu
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/