Messages in this thread Patch in this message | | | Date | Mon, 18 Jan 1999 17:49:35 +1100 | From | <> | Subject | [PATCH] Minor config changes against pre7ac7 |
| |
Alan, some minor config menu rearrangments,including the previous fix for the 'lost' PPP ond other options, as I think they should be. Others may disagree :)
Would the QIC-02 tape support be better under block devices? I haven't moved it.
Cheers, Steve
------------------------------------------------------------
diff -u --new-file --recursive linux.ac.orig/drivers/char/Config.in linux.ac/drivers/char/Config.in --- linux.ac.orig/drivers/char/Config.in Mon Jan 18 15:50:07 1999 +++ linux.ac/drivers/char/Config.in Mon Jan 18 17:31:45 1999 @@ -54,18 +54,6 @@ fi fi -bool 'Mouse Support (not serial mice)' CONFIG_MOUSE -if [ "$CONFIG_MOUSE" = "y" ]; then - mainmenu_option next_comment - comment 'Mice' - tristate 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE - tristate 'Logitech busmouse support' CONFIG_BUSMOUSE - tristate 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE - 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 - endmenu -fi tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE if [ "$CONFIG_QIC02_TAPE" != "n" ]; then @@ -79,10 +67,16 @@ fi fi +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 +fi + +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 @@ -94,15 +88,21 @@ tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT - endmenu 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 +mainmenu_option next_comment +comment 'Mice' +bool 'Mouse Support (not serial mice)' CONFIG_MOUSE +if [ "$CONFIG_MOUSE" = "y" ]; then + tristate 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE + tristate 'Logitech busmouse support' CONFIG_BUSMOUSE + tristate 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE + 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 mainmenu_option next_comment comment 'Video For Linux' diff -u --new-file --recursive linux.ac.orig/drivers/net/Config.in linux.ac/drivers/net/Config.in --- linux.ac.orig/drivers/net/Config.in Mon Jan 18 16:47:29 1999 +++ linux.ac/drivers/net/Config.in Mon Jan 18 17:14:00 1999 @@ -17,13 +17,6 @@ endmenu -tristate 'Dummy net driver support' CONFIG_DUMMY -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 - fi -fi # # Ethernet # @@ -194,28 +187,6 @@ fi endmenu - -if [ ! "$CONFIG_PARPORT" = "n" ]; then - dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT -fi - -tristate 'PPP (point-to-point) support' CONFIG_PPP -if [ ! "$CONFIG_PPP" = "n" ]; then - comment 'CCP compressors for PPP are only built as modules.' -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 -fi - -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 -fi mainmenu_option next_comment comment 'Token ring devices' diff -u --new-file --recursive linux.ac.orig/net/Config.in linux.ac/net/Config.in --- linux.ac.orig/net/Config.in Mon Jan 18 15:49:42 1999 +++ linux.ac/net/Config.in Mon Jan 18 17:14:27 1999 @@ -26,6 +26,36 @@ fi fi +if [ ! "$CONFIG_PARPORT" = "n" ]; then + dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT +fi + +tristate 'PPP (point-to-point) support' CONFIG_PPP +if [ ! "$CONFIG_PPP" = "n" ]; then + comment 'CCP compressors for PPP are only built as modules.' +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 +fi + +tristate 'Dummy net driver support' CONFIG_DUMMY +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 + fi +fi + +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 +fi + comment ' ' tristate 'The IPX protocol' CONFIG_IPX if [ "$CONFIG_IPX" != "n" ]; then - 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/
| |