Hi,
this patch make certain Config.in files compatible to the strict
type checking of mconfig, most problems are define_bool for non bool
arguments and bool/tristate with additional arguments.
Christoph
-- Always remember that you are unique. Just like everyone else.diff -rNu --exclude-from=exclude linux.orig/arch/i386/config.in linux/arch/i386/config.in --- linux.orig/arch/i386/config.in Wed Jun 7 23:27:17 2000 +++ linux/arch/i386/config.in Wed Jun 7 20:27:20 2000 @@ -171,7 +171,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi bool 'System V IPC' CONFIG_SYSVIPC diff -rNu --exclude-from=exclude linux.orig/arch/ia64/config.in linux/arch/ia64/config.in --- linux.orig/arch/ia64/config.in Sun Jun 4 20:37:41 2000 +++ linux/arch/ia64/config.in Wed Jun 7 23:18:01 2000 @@ -58,7 +58,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi mainmenu_option next_comment @@ -179,7 +179,7 @@ tristate 'Kernel support for IA-32 emulation' CONFIG_IA32_SUPPORT tristate 'Kernel FP software completion' CONFIG_MATHEMU else - define_bool CONFIG_MATHEMU y + define_tristate CONFIG_MATHEMU y fi bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ diff -rNu --exclude-from=exclude linux.orig/arch/mips/config.in linux/arch/mips/config.in --- linux.orig/arch/mips/config.in Sun Jun 4 20:50:06 2000 +++ linux/arch/mips/config.in Wed Jun 7 23:14:56 2000 @@ -159,7 +159,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi source drivers/block/Config.in diff -rNu --exclude-from=exclude linux.orig/arch/mips64/config.in linux/arch/mips64/config.in --- linux.orig/arch/mips64/config.in Sun Jun 4 20:50:07 2000 +++ linux/arch/mips64/config.in Wed Jun 7 23:13:38 2000 @@ -89,7 +89,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi bool 'System V IPC' CONFIG_SYSVIPC diff -rNu --exclude-from=exclude linux.orig/arch/ppc/config.in linux/arch/ppc/config.in --- linux.orig/arch/ppc/config.in Wed Jun 7 23:27:18 2000 +++ linux/arch/ppc/config.in Wed Jun 7 23:21:15 2000 @@ -119,7 +119,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi source drivers/parport/Config.in @@ -151,7 +151,7 @@ fi if [ "$CONFIG_PREP" = "y" -o "$CONFIG_ALL_PPC" = "y" ]; then - bool 'PReP bootloader kernel arguments' CONFIG_CMDLINE_BOOL y + bool 'PReP bootloader kernel arguments' CONFIG_CMDLINE_BOOL if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then string 'Initial kernel command string' CONFIG_CMDLINE "console=ttyS0,9600 console=tty0 root=/dev/sda2" fi diff -rNu --exclude-from=exclude linux.orig/arch/sh/config.in linux/arch/sh/config.in --- linux.orig/arch/sh/config.in Sun Jun 4 20:50:08 2000 +++ linux/arch/sh/config.in Wed Jun 7 23:24:21 2000 @@ -86,7 +86,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then source drivers/pcmcia/Config.in else - define_bool CONFIG_PCMCIA n + define_tristate CONFIG_PCMCIA n fi bool 'System V IPC' CONFIG_SYSVIPC @@ -161,7 +161,7 @@ if [ "$CONFIG_SERIAL" = "y" -o "$CONFIG_SERIAL" = "m" ]; then choice 'Serial interface type' \ "SCI CONFIG_SH_SCI_SERIAL \ - SCIF CONFIG_SH_SCIF_SERIAL" + SCIF CONFIG_SH_SCIF_SERIAL" SCI fi if [ "$CONFIG_SERIAL" = "y" ]; then bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE diff -rNu --exclude-from=exclude linux.orig/arch/sparc/config.in linux/arch/sparc/config.in --- linux.orig/arch/sparc/config.in Sun Jun 4 20:50:08 2000 +++ linux/arch/sparc/config.in Wed Jun 7 23:25:19 2000 @@ -170,8 +170,8 @@ mainmenu_option next_comment comment 'SCSI low-level drivers' - tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI - tristate 'PTI Qlogic,ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI + dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI + dep_tristate 'PTI Qlogic,ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI endmenu fi endmenu diff -rNu --exclude-from=exclude linux.orig/arch/sparc64/config.in linux/arch/sparc64/config.in --- linux.orig/arch/sparc64/config.in Sun Jun 4 20:50:09 2000 +++ linux/arch/sparc64/config.in Wed Jun 7 23:26:06 2000 @@ -158,15 +158,15 @@ mainmenu_option next_comment comment 'SCSI low-level drivers' - tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI - tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI + dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI + dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI if [ "$CONFIG_PCI" != "n" ]; then dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then - bool ' Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING Y + bool ' Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 8 - bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS N + bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS int ' Delay in seconds after SCSI bus reset' CONFIG_AIC7XXX_RESET_DELAY 5 fi dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI diff -rNu --exclude-from=exclude linux.orig/drivers/atm/Config.in linux/drivers/atm/Config.in --- linux.orig/drivers/atm/Config.in Wed Jun 7 23:27:18 2000 +++ linux/drivers/atm/Config.in Wed Jun 7 20:28:36 2000 @@ -55,7 +55,7 @@ tristate 'FORE Systems 200E-series' CONFIG_ATM_FORE200E_MAYBE if [ "$CONFIG_ATM_FORE200E_MAYBE" != "n" ]; then if [ "$CONFIG_PCI" = "y" ]; then - bool ' PCA-200E support' CONFIG_ATM_FORE200E_PCA y + bool ' PCA-200E support' CONFIG_ATM_FORE200E_PCA if [ "$CONFIG_ATM_FORE200E_PCA" = "y" ]; then bool ' Use default PCA-200E firmware (normally enabled)' CONFIG_ATM_FORE200E_PCA_DEFAULT_FW if [ "$CONFIG_ATM_FORE200E_PCA_DEFAULT_FW" = "n" ]; then @@ -64,7 +64,7 @@ fi fi if [ "$CONFIG_SBUS" = "y" ]; then - bool ' SBA-200E support' CONFIG_ATM_FORE200E_SBA y + bool ' SBA-200E support' CONFIG_ATM_FORE200E_SBA if [ "$CONFIG_ATM_FORE200E_SBA" = "y" ]; then bool ' Use default SBA-200E firmware (normally enabled)' CONFIG_ATM_FORE200E_SBA_DEFAULT_FW if [ "$CONFIG_ATM_FORE200E_SBA_DEFAULT_FW" = "n" ]; then diff -rNu --exclude-from=exclude linux.orig/drivers/block/Config.in linux/drivers/block/Config.in --- linux.orig/drivers/block/Config.in Wed Jun 7 23:27:18 2000 +++ linux/drivers/block/Config.in Wed Jun 7 20:27:56 2000 @@ -39,10 +39,8 @@ tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET -tristate 'Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM N -if [ "$CONFIG_BLK_DEV_LVM" != "n" ]; then - bool ' LVM information in proc filesystem' CONFIG_LVM_PROC_FS Y -fi +tristate 'Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM +dep_mbool ' LVM information in proc filesystem' CONFIG_LVM_PROC_FS $CONFIG_BLK_DEV_LVM bool 'Multiple devices driver support' CONFIG_BLK_DEV_MD dep_tristate ' Linear (append) mode' CONFIG_MD_LINEAR $CONFIG_BLK_DEV_MD diff -rNu --exclude-from=exclude linux.orig/drivers/char/Config.in linux/drivers/char/Config.in --- linux.orig/drivers/char/Config.in Wed Jun 7 23:27:18 2000 +++ linux/drivers/char/Config.in Wed Jun 7 20:29:04 2000 @@ -157,7 +157,7 @@ tristate 'Video For Linux' CONFIG_VIDEO_DEV if [ "$CONFIG_VIDEO_DEV" != "n" ]; then - bool ' V4L information in proc filesystem' CONFIG_VIDEO_PROC_FS Y + bool ' V4L information in proc filesystem' CONFIG_VIDEO_PROC_FS dep_tristate ' I2C on parallel port' CONFIG_I2C_PARPORT $CONFIG_PARPORT $CONFIG_I2C comment 'Radio Adapters' dep_tristate ' ADS Cadet AM/FM Tuner' CONFIG_RADIO_CADET $CONFIG_VIDEO_DEV @@ -220,7 +220,7 @@ fi dep_tristate ' CPiA Video For Linux' CONFIG_VIDEO_CPIA $CONFIG_VIDEO_DEV if [ "$CONFIG_VIDEO_CPIA" != "n" ]; then - if [ "CONFIG_PARPORT_1284" != "n" ]; then + if [ "$CONFIG_PARPORT_1284" != "n" ]; then dep_tristate ' CPiA Parallel Port Lowlevel Support' CONFIG_VIDEO_CPIA_PP $CONFIG_VIDEO_CPIA $CONFIG_PARPORT fi if [ "$CONFIG_USB" != "n" ]; then diff -rNu --exclude-from=exclude linux.orig/drivers/ieee1394/Config.in linux/drivers/ieee1394/Config.in --- linux.orig/drivers/ieee1394/Config.in Sun Jun 4 20:37:17 2000 +++ linux/drivers/ieee1394/Config.in Wed Jun 7 20:28:19 2000 @@ -4,7 +4,7 @@ mainmenu_option next_comment comment 'IEEE 1394 (FireWire) support' - tristate 'IEEE 1394 (FireWire) support (EXPERIMENTAL)' CONFIG_IEEE1394 $CONFIG_PCI + dep_tristate 'IEEE 1394 (FireWire) support (EXPERIMENTAL)' CONFIG_IEEE1394 $CONFIG_PCI if [ "$CONFIG_IEEE1394" != "n" ]; then diff -rNu --exclude-from=exclude linux.orig/drivers/s390/Config.in linux/drivers/s390/Config.in --- linux.orig/drivers/s390/Config.in Sun Jun 4 20:50:03 2000 +++ linux/drivers/s390/Config.in Wed Jun 7 23:23:15 2000 @@ -42,7 +42,7 @@ bool 'Channel Device Configuration (Temporary Option)' CONFIG_CHANDEV bool 'Network device support' CONFIG_NETDEVICES if [ "$CONFIG_NETDEVICES" = "y" ]; then - menu_option next_comment + mainmenu_option next_comment comment 'S390 Network devices' bool 'CTC device support' CONFIG_CTC bool 'IUCV device support (VM only)' CONFIG_IUCV @@ -50,6 +50,7 @@ bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET bool 'Token Ring driver support' CONFIG_TR bool 'FDDI driver support' CONFIG_FDDI + endmenu fi endmenu fi @@ -67,4 +68,4 @@ bool 'console on HWC line mode terminal' CONFIG_HWC_CONSOLE fi endmenu - +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/
This archive was generated by hypermail 2b29 : Thu Jun 15 2000 - 21:00:17 EST