[patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Kristen Carlson Accardi]

---
the build options submitted for 2.6.18-rcX for acpiphp and the dock
module are not quite right.  Can you please review this patch and 
make sure this makes sense?  I'd like this pushed to Linus as 
soon as possible.  

Change the build options for acpiphp so that it may build without
being dependent on the ACPI_DOCK option, but yet does not allow
the option of acpiphp being built-in when dock is built as a 
module.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
---
 drivers/pci/hotplug/Kconfig |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

--- 2.6-git.orig/drivers/pci/hotplug/Kconfig
+++ 2.6-git/drivers/pci/hotplug/Kconfig
@@ -74,9 +74,10 @@ config HOTPLUG_PCI_IBM
 
 	  When in doubt, say N.
 
+if ACPI_DOCK=n
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on ACPI_DOCK && HOTPLUG_PCI
+	depends on ACPI && HOTPLUG_PCI
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
 	  ACPI.
@@ -85,6 +86,20 @@ config HOTPLUG_PCI_ACPI
 	  module will be called acpiphp.
 
 	  When in doubt, say N.
+endif
+if ACPI_DOCK!=n
+config HOTPLUG_PCI_ACPI
+	tristate "ACPI PCI Hotplug driver"
+	depends on HOTPLUG_PCI && ACPI_DOCK
+	help
+	  Say Y here if you have a system that supports PCI Hotplug using
+	  ACPI.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called acpiphp.
+
+	  When in doubt, say N.
+endif
 
 config HOTPLUG_PCI_ACPI_IBM
 	tristate "ACPI PCI Hotplug driver IBM extensions"

Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Keshavamurthy Anil S]

On Tue, Jul 25, 2006 at 04:18:54PM -0700, Kristen Carlson Accardi wrote:
>     drivers/pci/hotplug/Kconfig |   17 ++++++++++++++++-
>     1 file changed, 16 insertions(+), 1 deletion(-)
Can;t this be done with just one line change?

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

> 
>     config HOTPLUG_PCI_ACPI
>            tristate "ACPI PCI Hotplug driver"
>    -       depends on ACPI_DOCK && HOTPLUG_PCI
	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)

Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Randy.Dunlap]

On Tue, 25 Jul 2006, Keshavamurthy Anil S wrote:

> On Tue, Jul 25, 2006 at 04:18:54PM -0700, Kristen Carlson Accardi wrote:
> >     drivers/pci/hotplug/Kconfig |   17 ++++++++++++++++-
> >     1 file changed, 16 insertions(+), 1 deletion(-)
> Can;t this be done with just one line change?

The first attempted patch was something like:

	depends on HOTPLUG_PCI && ACPI_DOCK!=n

but that is not legal kconfig language.
Did you have something else in mind?

> Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
>
> >
> >     config HOTPLUG_PCI_ACPI
> >            tristate "ACPI PCI Hotplug driver"
> >    -       depends on ACPI_DOCK && HOTPLUG_PCI
> 	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)

-- 
~Randy

Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Keshavamurthy Anil S]

On Tue, Jul 25, 2006 at 05:13:31PM -0700, Randy.Dunlap wrote:
> On Tue, 25 Jul 2006, Keshavamurthy Anil S wrote:
> 
> > On Tue, Jul 25, 2006 at 04:18:54PM -0700, Kristen Carlson Accardi wrote:
> > >     drivers/pci/hotplug/Kconfig |   17 ++++++++++++++++-
> > >     1 file changed, 16 insertions(+), 1 deletion(-)
> > Can;t this be done with just one line change?
> 
> The first attempted patch was something like:
> 
> 	depends on HOTPLUG_PCI && ACPI_DOCK!=n
> 
> but that is not legal kconfig language.
> Did you have something else in mind?

Yup, already mentioned in my first email.
Please see below which is just one line change
and acheives the same as your 17 line change patch.

> > >    -       depends on ACPI_DOCK && HOTPLUG_PCI
> > 	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)

-Anil

Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Kristen Carlson Accardi]

---
I confirmed that Anil's patch will work, here is a proper patch with
Anil's changes.

Change the build options for acpiphp so that it may build without being
dependent on the ACPI_DOCK option, but yet does not allow the option of
acpiphp being built-in when dock is built as a module.

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
---
 drivers/pci/hotplug/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 2.6-git.orig/drivers/pci/hotplug/Kconfig
+++ 2.6-git/drivers/pci/hotplug/Kconfig
@@ -76,7 +76,7 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on ACPI_DOCK && HOTPLUG_PCI
+	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
 	  ACPI.

Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Roman Zippel]

Hi,

On Wed, 26 Jul 2006, Kristen Carlson Accardi wrote:

>  config HOTPLUG_PCI_ACPI
>  	tristate "ACPI PCI Hotplug driver"
> -	depends on ACPI_DOCK && HOTPLUG_PCI
> +	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI)
>  	help

If you keep the HOTPLUG_PCI separate, it won't break the menu, e.g. 
((!ACPI_DOCK && ACPI) || ACPI_DOCK) && HOTPLUG_PCI
BTW most of this file could be put into a "if HOTPLUG_PCI" group, so all 
the HOTPLUG_PCI dependencies don't have to be repeated.

bye, Roman

RE: [patch] pci/hotplug acpiphp: fix Kconfig for Dock dependencies

[Brown, Len]

Applied.

thanks,
-Len 

>-----Original Message-----
>From: Kristen Carlson Accardi [mailto:kristen.c.accardi@intel.com] 
>Sent: Wednesday, July 26, 2006 1:32 PM
>To: Keshavamurthy, Anil S
>Cc: linux-acpi@vger.kernel.org; Brown, Len; akpm@osdl.org; 
>zippel@linux-m68k.org; rdunlap@xenotime.net; 
>linux-kernel@vger.kernel.org; greg@kroah.com; 
>pcihpd-discuss@lists.sourceforge.net
>Subject: Re: [patch] pci/hotplug acpiphp: fix Kconfig for Dock 
>dependencies
>
>---
>I confirmed that Anil's patch will work, here is a proper patch with
>Anil's changes.
>
>Change the build options for acpiphp so that it may build without being
>dependent on the ACPI_DOCK option, but yet does not allow the option of
>acpiphp being built-in when dock is built as a module.
>
>Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
>Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
>---
> drivers/pci/hotplug/Kconfig |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>--- 2.6-git.orig/drivers/pci/hotplug/Kconfig
>+++ 2.6-git/drivers/pci/hotplug/Kconfig
>@@ -76,7 +76,7 @@ config HOTPLUG_PCI_IBM
> 
> config HOTPLUG_PCI_ACPI
> 	tristate "ACPI PCI Hotplug driver"
>-	depends on ACPI_DOCK && HOTPLUG_PCI
>+	depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || 
>(ACPI_DOCK && HOTPLUG_PCI)
> 	help
> 	  Say Y here if you have a system that supports PCI 
>Hotplug using
> 	  ACPI.
>