* [Kernel-janitors] Kconfig cleanups
@ 2004-01-14 6:57 Matthew Wilcox
2004-01-14 19:46 ` Greg KH
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Matthew Wilcox @ 2004-01-14 6:57 UTC (permalink / raw)
To: kernel-janitors
It's not clear to me whether this works better split up into many smaller
patches or not. I'm happy to do that if people feel it's worthwhile.
This patch attempts to reduce the number of inappropriate questions being
asked by menuconfig.
Index: arch/arm26/Kconfig
=================================RCS file: /var/cvs/linux-2.6/arch/arm26/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- arch/arm26/Kconfig 28 Sep 2003 04:04:42 -0000 1.4
+++ arch/arm26/Kconfig 14 Jan 2004 06:44:44 -0000
@@ -216,11 +216,6 @@ source "drivers/input/Kconfig"
source "drivers/char/Kconfig"
-config KBDMOUSE
- bool
- depends on ARCH_ACORN && BUSMOUSE=y
- default y
-
source "drivers/media/Kconfig"
source "fs/Kconfig"
Index: drivers/block/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/block/Kconfig,v
retrieving revision 1.5
diff -u -p -r1.5 Kconfig
--- drivers/block/Kconfig 18 Oct 2003 00:23:04 -0000 1.5
+++ drivers/block/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -6,7 +6,7 @@ menu "Block devices"
config BLK_DEV_FD
tristate "Normal floppy disk support"
- depends on !X86_PC9800 && !ARCH_S390
+ depends on !X86_PC9800 && !ARCH_S390 && !AMIGA && !ATARI && !IA64
---help---
If you want to use the floppy disk drive(s) of your PC under Linux,
say Y. Information about this driver, especially important for IBM
Index: drivers/char/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/char/Kconfig,v
retrieving revision 1.8
diff -u -p -r1.8 Kconfig
--- drivers/char/Kconfig 26 Oct 2003 15:16:50 -0000 1.8
+++ drivers/char/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -595,6 +595,7 @@ menu "Mice"
config BUSMOUSE
tristate "Bus Mouse Support"
+ depends ARM26
---help---
Say Y here if your machine has a bus mouse as opposed to a serial
mouse. Most people have a regular serial MouseSystem or
@@ -612,10 +613,15 @@ config BUSMOUSE
To compile this driver as a module, choose M here: the
module will be called busmouse.
+config KBDMOUSE
+ def_bool y
+ depends on ARM26 && ARCH_ACORN && BUSMOUSE
+
endmenu
config QIC02_TAPE
tristate "QIC-02 tape support"
+ depends ISA
help
If you have a non-SCSI tape drive like that, say Y.
Index: drivers/char/agp/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/char/agp/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- drivers/char/agp/Kconfig 28 Sep 2003 04:05:17 -0000 1.4
+++ drivers/char/agp/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -1,5 +1,6 @@
config AGP
tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+ depends on PCI
default y if GART_IOMMU
---help---
AGP (Accelerated Graphics Port) is a bus system mainly used to
Index: drivers/char/drm/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/char/drm/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- drivers/char/drm/Kconfig 28 Sep 2003 04:05:17 -0000 1.3
+++ drivers/char/drm/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -6,6 +6,7 @@
#
config DRM
bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
+ depends on PCI
help
Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select
@@ -17,21 +18,21 @@ config DRM
config DRM_TDFX
tristate "3dfx Banshee/Voodoo3+"
- depends on DRM
+ depends on DRM && PCI
help
Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
graphics card. If M is selected, the module will be called tdfx.
config DRM_GAMMA
tristate "3dlabs GMX 2000"
- depends on DRM
+ depends on DRM && PCI
help
This is the old gamma driver, please tell me if it might actually
work.
config DRM_R128
tristate "ATI Rage 128"
- depends on DRM
+ depends on DRM && PCI
help
Choose this option if you have an ATI Rage 128 graphics card. If M
is selected, the module will be called r128. AGP support for
@@ -39,7 +40,7 @@ config DRM_R128
config DRM_RADEON
tristate "ATI Radeon"
- depends on DRM
+ depends on DRM && PCI
help
Choose this option if you have an ATI Radeon graphics card. There
are both PCI and AGP versions. You don't need to choose this to
@@ -77,7 +78,7 @@ config DRM_SIS
tristate "SiS video cards"
depends on DRM && AGP
help
- Choose this option if you have a SiS 630 or compatibel video
+ Choose this option if you have a SiS 630 or compatible video
chipset. If M is selected the module will be called sis. AGP
support is required for this driver to work.
Index: drivers/char/ipmi/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/char/ipmi/Kconfig,v
retrieving revision 1.2
diff -u -p -r1.2 Kconfig
--- drivers/char/ipmi/Kconfig 18 Oct 2003 00:23:06 -0000 1.2
+++ drivers/char/ipmi/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -3,6 +3,8 @@
#
menu "IPMI"
+ depends on X86 || IA64
+
config IPMI_HANDLER
tristate 'IPMI top-level message handler'
help
Index: drivers/i2c/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/i2c/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- drivers/i2c/Kconfig 28 Sep 2003 04:05:21 -0000 1.4
+++ drivers/i2c/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -37,9 +37,9 @@ config I2C_CHARDEV
This support is also available as a module. If so, the module
will be called i2c-dev.
- source drivers/i2c/algos/Kconfig
- source drivers/i2c/busses/Kconfig
- source drivers/i2c/chips/Kconfig
+source drivers/i2c/algos/Kconfig
+source drivers/i2c/busses/Kconfig
+source drivers/i2c/chips/Kconfig
endmenu
Index: drivers/i2c/algos/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/i2c/algos/Kconfig,v
retrieving revision 1.2
diff -u -p -r1.2 Kconfig
--- drivers/i2c/algos/Kconfig 28 Sep 2003 04:05:21 -0000 1.2
+++ drivers/i2c/algos/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -3,6 +3,7 @@
#
menu "I2C Algorithms"
+ depends on I2C
config I2C_ALGOBIT
tristate "I2C bit-banging interfaces"
Index: drivers/i2c/busses/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/i2c/busses/Kconfig,v
retrieving revision 1.6
diff -u -p -r1.6 Kconfig
--- drivers/i2c/busses/Kconfig 7 Jan 2004 21:30:18 -0000 1.6
+++ drivers/i2c/busses/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -3,6 +3,7 @@
#
menu "I2C Hardware Bus support"
+ depends on I2C
config I2C_ALI1535
tristate "ALI 1535"
Index: drivers/i2c/chips/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/i2c/chips/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- drivers/i2c/chips/Kconfig 7 Jan 2004 21:30:18 -0000 1.4
+++ drivers/i2c/chips/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -3,6 +3,7 @@
#
menu "I2C Hardware Sensors Chip support"
+ depends on I2C
config I2C_SENSOR
tristate
Index: drivers/media/dvb/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/media/dvb/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- drivers/media/dvb/Kconfig 7 Jan 2004 21:30:22 -0000 1.4
+++ drivers/media/dvb/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -3,6 +3,7 @@
#
menu "Digital Video Broadcasting Devices"
+ depends on PCI || USB
config DVB
bool "DVB For Linux"
Index: drivers/message/fusion/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/message/fusion/Kconfig,v
retrieving revision 1.2
diff -u -p -r1.2 Kconfig
--- drivers/message/fusion/Kconfig 28 Sep 2003 04:05:32 -0000 1.2
+++ drivers/message/fusion/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -1,5 +1,6 @@
menu "Fusion MPT device support"
+ depends on PCI
config FUSION
tristate "Fusion MPT (base + ScsiHost) drivers"
Index: drivers/message/i2o/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/message/i2o/Kconfig,v
retrieving revision 1.2
diff -u -p -r1.2 Kconfig
--- drivers/message/i2o/Kconfig 28 Sep 2003 04:05:33 -0000 1.2
+++ drivers/message/i2o/Kconfig 14 Jan 2004 06:44:45 -0000
@@ -1,9 +1,9 @@
menu "I2O device support"
+ depends on PCI
config I2O
tristate "I2O support"
- depends on PCI
---help---
The Intelligent Input/Output (I2O) architecture allows hardware
drivers to be split into two parts: an operating system specific
Index: drivers/parport/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/parport/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- drivers/parport/Kconfig 28 Sep 2003 04:05:43 -0000 1.3
+++ drivers/parport/Kconfig 14 Jan 2004 06:44:46 -0000
@@ -34,27 +34,21 @@ config PARPORT
config PARPORT_PC
tristate "PC-style hardware"
- depends on PARPORT && (!SPARC64 || PCI)
+ depends on PARPORT && (!SPARC64 || PCI) && (!PARISC || SUPERIO) && (!M68K || Q40)
---help---
You should say Y here if you have a PC-style parallel port. All
IBM PC compatible computers and some Alphas have PC-style
parallel ports. PA-RISC owners should only say Y here if they
- have a SuperIO parallel port.
+ have a SuperIO parallel port. Q40 owners should say Y here.
To compile this driver as a module, choose M here: the
module will be called parport_pc.
If unsure, say Y.
-config PARPORT_PC_CML1
- tristate
- depends on PARPORT!=n && PARPORT_PC!=n
- default PARPORT_PC if SERIAL_8250=y
- default m if SERIAL_8250=m
-
config PARPORT_SERIAL
tristate "Multi-IO cards (parallel and serial)"
- depends on SERIAL_8250!=n && PARPORT_PC_CML1
+ depends on SERIAL_8250 && PARPORT_PC
help
This adds support for multi-IO PCI cards that have parallel and
serial ports. You should say Y or M here. If you say M, the module
Index: drivers/pnp/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/pnp/Kconfig,v
retrieving revision 1.2
diff -u -p -r1.2 Kconfig
--- drivers/pnp/Kconfig 12 Aug 2003 19:11:11 -0000 1.2
+++ drivers/pnp/Kconfig 14 Jan 2004 06:44:46 -0000
@@ -3,6 +3,7 @@
#
menu "Plug and Play support"
+ depends X86 || ISA
config PNP
bool "Plug and Play support"
@@ -32,7 +33,7 @@ comment "Protocols"
config ISAPNP
bool "ISA Plug and Play support (EXPERIMENTAL)"
- depends on PNP && EXPERIMENTAL
+ depends on ISA && PNP && EXPERIMENTAL
help
Say Y here if you would like support for ISA Plug and Play devices.
Some information is in <file:Documentation/isapnp.txt>.
@@ -41,7 +42,7 @@ config ISAPNP
config PNPBIOS
bool "Plug and Play BIOS support (EXPERIMENTAL)"
- depends on PNP && EXPERIMENTAL
+ depends on X86 && PNP && EXPERIMENTAL
---help---
Linux uses the PNPBIOS as defined in "Plug and Play BIOS
Specification Version 1.0A May 5, 1994" to autodetect built-in
Index: drivers/telephony/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/telephony/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- drivers/telephony/Kconfig 28 Sep 2003 04:05:53 -0000 1.3
+++ drivers/telephony/Kconfig 14 Jan 2004 06:44:46 -0000
@@ -6,6 +6,7 @@ menu "Telephony Support"
config PHONE
tristate "Linux telephony support"
+ depends on PCI || ISA || PCMCIA
---help---
Say Y here if you have a telephony card, which for example allows
you to use a regular phone for voice-over-IP applications.
@@ -18,7 +19,7 @@ config PHONE
config PHONE_IXJ
tristate "QuickNet Internet LineJack/PhoneJack support"
- depends on PHONE
+ depends on PHONE && (PCI || ISA)
---help---
Say M if you have a telephony card manufactured by Quicknet
Technologies, Inc. These include the Internet PhoneJACK and
Index: drivers/video/console/Kconfig
=================================RCS file: /var/cvs/linux-2.6/drivers/video/console/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- drivers/video/console/Kconfig 24 Nov 2003 03:16:20 -0000 1.4
+++ drivers/video/console/Kconfig 14 Jan 2004 06:44:46 -0000
@@ -44,6 +44,7 @@ config VIDEO_SELECT
config MDA_CONSOLE
tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
+ depends on X86
---help---
Say Y here if you have an old MDA or monochrome Hercules graphics
adapter in your system acting as a second head ( = video card). You
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
@ 2004-01-14 19:46 ` Greg KH
2004-01-14 21:05 ` Adrian Bunk
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2004-01-14 19:46 UTC (permalink / raw)
To: kernel-janitors
On Wed, Jan 14, 2004 at 06:57:42AM +0000, Matthew Wilcox wrote:
>
> It's not clear to me whether this works better split up into many smaller
> patches or not. I'm happy to do that if people feel it's worthwhile.
>
> This patch attempts to reduce the number of inappropriate questions being
> asked by menuconfig.
I picked out the i2c specific pieces here and applied them to my tree to
send to Linus.
And PLEASE generate these patches so they can be applied with -p1, you
should know better :)
thanks,
greg k-h
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
2004-01-14 19:46 ` Greg KH
@ 2004-01-14 21:05 ` Adrian Bunk
2004-01-14 22:48 ` Matthew Wilcox
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Adrian Bunk @ 2004-01-14 21:05 UTC (permalink / raw)
To: kernel-janitors
On Wed, Jan 14, 2004 at 06:57:42AM +0000, Matthew Wilcox wrote:
>...
> --- drivers/char/drm/Kconfig 28 Sep 2003 04:05:17 -0000 1.3
> +++ drivers/char/drm/Kconfig 14 Jan 2004 06:44:45 -0000
> @@ -6,6 +6,7 @@
> #
> config DRM
> bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> + depends on PCI
> help
> Kernel-level support for the Direct Rendering Infrastructure (DRI)
> introduced in XFree86 4.0. If you say Y here, you need to select
> @@ -17,21 +18,21 @@ config DRM
>
> config DRM_TDFX
> tristate "3dfx Banshee/Voodoo3+"
> - depends on DRM
> + depends on DRM && PCI
> help
> Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
> graphics card. If M is selected, the module will be called tdfx.
>
> config DRM_GAMMA
> tristate "3dlabs GMX 2000"
> - depends on DRM
> + depends on DRM && PCI
> help
> This is the old gamma driver, please tell me if it might actually
> work.
>
> config DRM_R128
> tristate "ATI Rage 128"
> - depends on DRM
> + depends on DRM && PCI
> help
> Choose this option if you have an ATI Rage 128 graphics card. If M
> is selected, the module will be called r128. AGP support for
> @@ -39,7 +40,7 @@ config DRM_R128
>
> config DRM_RADEON
> tristate "ATI Radeon"
> - depends on DRM
> + depends on DRM && PCI
> help
> Choose this option if you have an ATI Radeon graphics card. There
> are both PCI and AGP versions. You don't need to choose this to
>...
If you let DRM depend on PCI, everything depending on DRM already has an
implicit dependency on PCI.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
2004-01-14 19:46 ` Greg KH
2004-01-14 21:05 ` Adrian Bunk
@ 2004-01-14 22:48 ` Matthew Wilcox
2004-01-15 0:20 ` Dave Jones
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Matthew Wilcox @ 2004-01-14 22:48 UTC (permalink / raw)
To: kernel-janitors
On Wed, Jan 14, 2004 at 10:05:58PM +0100, Adrian Bunk wrote:
> On Wed, Jan 14, 2004 at 06:57:42AM +0000, Matthew Wilcox wrote:
> >...
> > --- drivers/char/drm/Kconfig 28 Sep 2003 04:05:17 -0000 1.3
> > +++ drivers/char/drm/Kconfig 14 Jan 2004 06:44:45 -0000
> > @@ -6,6 +6,7 @@
> > #
> > config DRM
> > bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> > + depends on PCI
> > help
> > Kernel-level support for the Direct Rendering Infrastructure (DRI)
> > introduced in XFree86 4.0. If you say Y here, you need to select
> > @@ -17,21 +18,21 @@ config DRM
> >
> > config DRM_TDFX
> > tristate "3dfx Banshee/Voodoo3+"
> > - depends on DRM
> > + depends on DRM && PCI
> > help
> > Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
> > graphics card. If M is selected, the module will be called tdfx.
> >
> >...
>
>
> If you let DRM depend on PCI, everything depending on DRM already has an
> implicit dependency on PCI.
That's true. However, there's nothing *intrinsic* about DRM that depends on
PCI. There's no reason that someone shouldn't do a DRM module for an SBUS
or GSC card. When one exists, the menu should depend on (PCI || SBUS).
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
` (2 preceding siblings ...)
2004-01-14 22:48 ` Matthew Wilcox
@ 2004-01-15 0:20 ` Dave Jones
2004-01-15 4:24 ` Matthew Wilcox
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Dave Jones @ 2004-01-15 0:20 UTC (permalink / raw)
To: kernel-janitors
On Wed, Jan 14, 2004 at 10:48:09PM +0000, Matthew Wilcox wrote:
> On Wed, Jan 14, 2004 at 10:05:58PM +0100, Adrian Bunk wrote:
> > On Wed, Jan 14, 2004 at 06:57:42AM +0000, Matthew Wilcox wrote:
> > >...
> > > --- drivers/char/drm/Kconfig 28 Sep 2003 04:05:17 -0000 1.3
> > > +++ drivers/char/drm/Kconfig 14 Jan 2004 06:44:45 -0000
> > > @@ -6,6 +6,7 @@
> > > #
> > > config DRM
> > > bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> > > + depends on PCI
> > > help
> > > Kernel-level support for the Direct Rendering Infrastructure (DRI)
> > > introduced in XFree86 4.0. If you say Y here, you need to select
> > > @@ -17,21 +18,21 @@ config DRM
> > >
> > > config DRM_TDFX
> > > tristate "3dfx Banshee/Voodoo3+"
> > > - depends on DRM
> > > + depends on DRM && PCI
> > > help
> > > Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
> > > graphics card. If M is selected, the module will be called tdfx.
> > >
> > >...
> >
> >
> > If you let DRM depend on PCI, everything depending on DRM already has an
> > implicit dependency on PCI.
>
>
> That's true. However, there's nothing *intrinsic* about DRM that depends on
> PCI. There's no reason that someone shouldn't do a DRM module for an SBUS
> or GSC card. When one exists, the menu should depend on (PCI || SBUS).
Sparc64 has a DRM module for Creator3D, which I *think* is SBUS.
Yes, Sparc* has to be different and put its DRM Kconfig stuff
in arch/sparc64/Kconfig instead.
Dave
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
` (3 preceding siblings ...)
2004-01-15 0:20 ` Dave Jones
@ 2004-01-15 4:24 ` Matthew Wilcox
2004-01-15 11:41 ` Adrian Bunk
2004-01-23 0:36 ` Bjorn Helgaas
6 siblings, 0 replies; 9+ messages in thread
From: Matthew Wilcox @ 2004-01-15 4:24 UTC (permalink / raw)
To: kernel-janitors
On Thu, Jan 15, 2004 at 12:20:44AM +0000, Dave Jones wrote:
> Sparc64 has a DRM module for Creator3D, which I *think* is SBUS.
> Yes, Sparc* has to be different and put its DRM Kconfig stuff
> in arch/sparc64/Kconfig instead.
Part of the reason for this cleanup is to remove crap like that from
the arch Kconfig files; keeping all this up to date is one of the least
interesting bits of being an arch maintainer. I'll incorporate removing
this from Sparc64 into my patchset. Thanks.
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
` (4 preceding siblings ...)
2004-01-15 4:24 ` Matthew Wilcox
@ 2004-01-15 11:41 ` Adrian Bunk
2004-01-23 0:36 ` Bjorn Helgaas
6 siblings, 0 replies; 9+ messages in thread
From: Adrian Bunk @ 2004-01-15 11:41 UTC (permalink / raw)
To: kernel-janitors
On Wed, Jan 14, 2004 at 10:48:09PM +0000, Matthew Wilcox wrote:
> On Wed, Jan 14, 2004 at 10:05:58PM +0100, Adrian Bunk wrote:
> > On Wed, Jan 14, 2004 at 06:57:42AM +0000, Matthew Wilcox wrote:
> > >...
> > > --- drivers/char/drm/Kconfig 28 Sep 2003 04:05:17 -0000 1.3
> > > +++ drivers/char/drm/Kconfig 14 Jan 2004 06:44:45 -0000
> > > @@ -6,6 +6,7 @@
> > > #
> > > config DRM
> > > bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> > > + depends on PCI
> > > help
> > > Kernel-level support for the Direct Rendering Infrastructure (DRI)
> > > introduced in XFree86 4.0. If you say Y here, you need to select
> > > @@ -17,21 +18,21 @@ config DRM
> > >
> > > config DRM_TDFX
> > > tristate "3dfx Banshee/Voodoo3+"
> > > - depends on DRM
> > > + depends on DRM && PCI
> > > help
> > > Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
> > > graphics card. If M is selected, the module will be called tdfx.
> > >
> > >...
> >
> >
> > If you let DRM depend on PCI, everything depending on DRM already has an
> > implicit dependency on PCI.
>
>
> That's true. However, there's nothing *intrinsic* about DRM that depends on
> PCI. There's no reason that someone shouldn't do a DRM module for an SBUS
> or GSC card. When one exists, the menu should depend on (PCI || SBUS).
Ah, thanks for the explanation.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* [Kernel-janitors] Kconfig cleanups
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
@ 2004-01-23 0:36 ` Bjorn Helgaas
2004-01-14 21:05 ` Adrian Bunk
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Bjorn Helgaas @ 2004-01-23 0:36 UTC (permalink / raw)
To: kernel-janitors
I've been playing with "make allmodconfig" on ia64 and found lots of
nits. Many of them are addressed by your kconfig cleanups patch I
found on the kernel janitors list.
Here are a few more. If you want to incorporate them with yours,
that's fine, or I'm open to other suggestions.
HW_RANDOM - looks like the hardware is on Tiger, so maybe should be
made to work eventually; currently it requires x86 asm()
NVRAM - arch depends below reflect #error analysis in driver
GEN_RTC - requires "asm/rtc.h", which we don't have
I2O_SCSI - depends !64BIT reflects #error in driver
VLSI_FIR - depends X86 reflects #error in vlsi_ir.h
SCSI_BUSLOGIC - I don't see any mention of MCA in the driver, but I
could be missing it
PARPORT_PC - shouldn't we have a !IA64 as well?
SYNCLINK, TMS380TR, SCSI_BUSLOGIC, SCSI_EATA, SCSI_FUTURE_DOMAIN -
these all require both ISA && PCI. Or at least, they use bits of
the ISA inteface (isa_virt_to_bus, request_dma, etc), that are not
available on ia64, and they don't use CONFIG_ISA to conditionally
compile those references.
=== drivers/char/Kconfig 1.26 vs edited ==--- 1.26/drivers/char/Kconfig Thu Jan 15 03:34:16 2004
+++ edited/drivers/char/Kconfig Thu Jan 22 13:26:06 2004
@@ -214,7 +214,7 @@
config SYNCLINK
tristate "Microgate SyncLink card support"
- depends on SERIAL_NONSTANDARD
+ depends on SERIAL_NONSTANDARD && ISA && PCI
help
Provides support for the SyncLink ISA and PCI multiprotocol serial
adapters. These adapters support asynchronous and HDLC bit
@@ -714,7 +715,7 @@
config HW_RANDOM
tristate "Intel/AMD/VIA HW Random Number Generator support"
- depends on (X86 || IA64) && PCI
+ depends on X86 && PCI
---help---
This driver provides kernel-side support for the Random Number
Generator hardware found on Intel i8xx-based motherboards,
@@ -729,6 +730,7 @@
config NVRAM
tristate "/dev/nvram support"
+ depends on ATARI || X86 || X86_64 || ARM
---help---
If you say Y here and create a character special file /dev/nvram
with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -780,7 +782,7 @@
config GEN_RTC
tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
+ depends on RTC!=y && !IA64
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
=== drivers/message/i2o/Kconfig 1.5 vs edited ==--- 1.5/drivers/message/i2o/Kconfig Thu Sep 11 21:19:35 2003
+++ edited/drivers/message/i2o/Kconfig Wed Jan 21 17:25:17 2004
@@ -46,7 +46,7 @@
config I2O_SCSI
tristate "I2O SCSI OSM"
- depends on I2O && SCSI
+ depends on I2O && SCSI && !64BIT
help
Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
I2O controller. You can use both the SCSI and Block OSM together if
=== drivers/net/irda/Kconfig 1.12 vs edited ==--- 1.12/drivers/net/irda/Kconfig Wed Sep 24 21:39:20 2003
+++ edited/drivers/net/irda/Kconfig Thu Jan 22 12:38:26 2004
@@ -284,7 +284,7 @@
config VLSI_FIR
tristate "VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)"
- depends on EXPERIMENTAL && IRDA && PCI
+ depends on EXPERIMENTAL && IRDA && PCI && X86
help
Say Y here if you want to build support for the VLSI 82C147
PCI-IrDA Controller. This controller is used by the HP OmniBook 800
=== drivers/net/tokenring/Kconfig 1.12 vs edited ==--- 1.12/drivers/net/tokenring/Kconfig Sat Dec 20 19:37:05 2003
+++ edited/drivers/net/tokenring/Kconfig Thu Jan 22 13:27:21 2004
@@ -84,7 +84,7 @@
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
- depends on TR && (PCI || ISA)
+ depends on TR && PCI && ISA
---help---
This driver provides generic support for token ring adapters
based on the Texas Instruments TMS380 series chipsets. This
=== drivers/scsi/Kconfig 1.48 vs edited ==--- 1.48/drivers/scsi/Kconfig Thu Jan 15 03:18:55 2004
+++ edited/drivers/scsi/Kconfig Thu Jan 22 14:57:37 2004
@@ -457,15 +457,13 @@
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
- depends on (PCI || ISA || MCA) && SCSI
+ depends on PCI && ISA && SCSI
---help---
This is support for BusLogic MultiMaster and FlashPoint SCSI Host
Adapters. Consult the SCSI-HOWTO, available from
<http://www.tldp.org/docs.html#howto>, and the files
<file:Documentation/scsi/BusLogic.txt> and
- <file:Documentation/scsi/FlashPoint.txt> for more information. If this
- driver does not work correctly without modification, please contact
- the author, Leonard N. Zubkoff, by email to lnz@dandelion.com.
+ <file:Documentation/scsi/FlashPoint.txt> for more information.
To compile this driver as a module, choose M here: the
module will be called BusLogic.
@@ -509,7 +507,7 @@
config SCSI_EATA
tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support"
- depends on (ISA || EISA || PCI) && SCSI
+ depends on ISA && (EISA || PCI) && SCSI
---help---
This driver supports all EATA/DMA-compliant SCSI host adapters. DPT
ISA and all EISA I/O addresses are probed looking for the "EATA"
@@ -571,7 +569,7 @@
config SCSI_FUTURE_DOMAIN
tristate "Future Domain 16xx SCSI/AHA-2920A support"
- depends on (ISA || PCI) && SCSI
+ depends on ISA && PCI && SCSI
---help---
This is support for Future Domain's 16-bit SCSI host adapters
(TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Kconfig cleanups
@ 2004-01-23 0:36 ` Bjorn Helgaas
0 siblings, 0 replies; 9+ messages in thread
From: Bjorn Helgaas @ 2004-01-23 0:36 UTC (permalink / raw)
To: kernel-janitors
I've been playing with "make allmodconfig" on ia64 and found lots of
nits. Many of them are addressed by your kconfig cleanups patch I
found on the kernel janitors list.
Here are a few more. If you want to incorporate them with yours,
that's fine, or I'm open to other suggestions.
HW_RANDOM - looks like the hardware is on Tiger, so maybe should be
made to work eventually; currently it requires x86 asm()
NVRAM - arch depends below reflect #error analysis in driver
GEN_RTC - requires "asm/rtc.h", which we don't have
I2O_SCSI - depends !64BIT reflects #error in driver
VLSI_FIR - depends X86 reflects #error in vlsi_ir.h
SCSI_BUSLOGIC - I don't see any mention of MCA in the driver, but I
could be missing it
PARPORT_PC - shouldn't we have a !IA64 as well?
SYNCLINK, TMS380TR, SCSI_BUSLOGIC, SCSI_EATA, SCSI_FUTURE_DOMAIN -
these all require both ISA && PCI. Or at least, they use bits of
the ISA inteface (isa_virt_to_bus, request_dma, etc), that are not
available on ia64, and they don't use CONFIG_ISA to conditionally
compile those references.
=== drivers/char/Kconfig 1.26 vs edited ==--- 1.26/drivers/char/Kconfig Thu Jan 15 03:34:16 2004
+++ edited/drivers/char/Kconfig Thu Jan 22 13:26:06 2004
@@ -214,7 +214,7 @@
config SYNCLINK
tristate "Microgate SyncLink card support"
- depends on SERIAL_NONSTANDARD
+ depends on SERIAL_NONSTANDARD && ISA && PCI
help
Provides support for the SyncLink ISA and PCI multiprotocol serial
adapters. These adapters support asynchronous and HDLC bit
@@ -714,7 +715,7 @@
config HW_RANDOM
tristate "Intel/AMD/VIA HW Random Number Generator support"
- depends on (X86 || IA64) && PCI
+ depends on X86 && PCI
---help---
This driver provides kernel-side support for the Random Number
Generator hardware found on Intel i8xx-based motherboards,
@@ -729,6 +730,7 @@
config NVRAM
tristate "/dev/nvram support"
+ depends on ATARI || X86 || X86_64 || ARM
---help---
If you say Y here and create a character special file /dev/nvram
with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -780,7 +782,7 @@
config GEN_RTC
tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
+ depends on RTC!=y && !IA64
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
=== drivers/message/i2o/Kconfig 1.5 vs edited ==--- 1.5/drivers/message/i2o/Kconfig Thu Sep 11 21:19:35 2003
+++ edited/drivers/message/i2o/Kconfig Wed Jan 21 17:25:17 2004
@@ -46,7 +46,7 @@
config I2O_SCSI
tristate "I2O SCSI OSM"
- depends on I2O && SCSI
+ depends on I2O && SCSI && !64BIT
help
Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
I2O controller. You can use both the SCSI and Block OSM together if
=== drivers/net/irda/Kconfig 1.12 vs edited ==--- 1.12/drivers/net/irda/Kconfig Wed Sep 24 21:39:20 2003
+++ edited/drivers/net/irda/Kconfig Thu Jan 22 12:38:26 2004
@@ -284,7 +284,7 @@
config VLSI_FIR
tristate "VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)"
- depends on EXPERIMENTAL && IRDA && PCI
+ depends on EXPERIMENTAL && IRDA && PCI && X86
help
Say Y here if you want to build support for the VLSI 82C147
PCI-IrDA Controller. This controller is used by the HP OmniBook 800
=== drivers/net/tokenring/Kconfig 1.12 vs edited ==--- 1.12/drivers/net/tokenring/Kconfig Sat Dec 20 19:37:05 2003
+++ edited/drivers/net/tokenring/Kconfig Thu Jan 22 13:27:21 2004
@@ -84,7 +84,7 @@
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
- depends on TR && (PCI || ISA)
+ depends on TR && PCI && ISA
---help---
This driver provides generic support for token ring adapters
based on the Texas Instruments TMS380 series chipsets. This
=== drivers/scsi/Kconfig 1.48 vs edited ==--- 1.48/drivers/scsi/Kconfig Thu Jan 15 03:18:55 2004
+++ edited/drivers/scsi/Kconfig Thu Jan 22 14:57:37 2004
@@ -457,15 +457,13 @@
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
- depends on (PCI || ISA || MCA) && SCSI
+ depends on PCI && ISA && SCSI
---help---
This is support for BusLogic MultiMaster and FlashPoint SCSI Host
Adapters. Consult the SCSI-HOWTO, available from
<http://www.tldp.org/docs.html#howto>, and the files
<file:Documentation/scsi/BusLogic.txt> and
- <file:Documentation/scsi/FlashPoint.txt> for more information. If this
- driver does not work correctly without modification, please contact
- the author, Leonard N. Zubkoff, by email to lnz@dandelion.com.
+ <file:Documentation/scsi/FlashPoint.txt> for more information.
To compile this driver as a module, choose M here: the
module will be called BusLogic.
@@ -509,7 +507,7 @@
config SCSI_EATA
tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support"
- depends on (ISA || EISA || PCI) && SCSI
+ depends on ISA && (EISA || PCI) && SCSI
---help---
This driver supports all EATA/DMA-compliant SCSI host adapters. DPT
ISA and all EISA I/O addresses are probed looking for the "EATA"
@@ -571,7 +569,7 @@
config SCSI_FUTURE_DOMAIN
tristate "Future Domain 16xx SCSI/AHA-2920A support"
- depends on (ISA || PCI) && SCSI
+ depends on ISA && PCI && SCSI
---help---
This is support for Future Domain's 16-bit SCSI host adapters
(TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2004-01-23 0:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-01-14 6:57 [Kernel-janitors] Kconfig cleanups Matthew Wilcox
2004-01-14 19:46 ` Greg KH
2004-01-14 21:05 ` Adrian Bunk
2004-01-14 22:48 ` Matthew Wilcox
2004-01-15 0:20 ` Dave Jones
2004-01-15 4:24 ` Matthew Wilcox
2004-01-15 11:41 ` Adrian Bunk
2004-01-23 0:36 ` Bjorn Helgaas
2004-01-23 0:36 ` Bjorn Helgaas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.