2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Miles Lane]

drivers/built-in.o: In function
`is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined
reference to `is_dock_device'
drivers/built-in.o: In function
`cleanup_bridge':acpiphp_glue.c:(.text+0x12bc4): undefined reference
to `is_dock_device'
:acpiphp_glue.c:(.text+0x12bd3): undefined reference to
`unregister_hotplug_dock_device'
:acpiphp_glue.c:(.text+0x12bdb): undefined reference to
`unregister_dock_notifier'
drivers/built-in.o: In function
`register_slot':acpiphp_glue.c:(.text+0x13ac0): undefined reference to
`is_dock_device'
:acpiphp_glue.c:(.text+0x13cd9): undefined reference to `is_dock_device'
:acpiphp_glue.c:(.text+0x13cf0): undefined reference to
`register_hotplug_dock_device'
:acpiphp_glue.c:(.text+0x13d1d): undefined reference to `register_dock_notifier'
make: *** [.tmp_vmlinux1] Error 1

#
# PCI Hotplug Support
#
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_FAKE=y
CONFIG_HOTPLUG_PCI_COMPAQ=y
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=y
CONFIG_HOTPLUG_PCI_CPCI=y
# CONFIG_HOTPLUG_PCI_CPCI_ZT5550 is not set
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=y
CONFIG_HOTPLUG_PCI_SHPC=y
# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Adrian Bunk]

On Sun, Jun 25, 2006 at 12:56:44PM -0700, Miles Lane wrote:
> drivers/built-in.o: In function
> `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined
> reference to `is_dock_device'
> drivers/built-in.o: In function
> `cleanup_bridge':acpiphp_glue.c:(.text+0x12bc4): undefined reference
> to `is_dock_device'
> :acpiphp_glue.c:(.text+0x12bd3): undefined reference to
> `unregister_hotplug_dock_device'
> :acpiphp_glue.c:(.text+0x12bdb): undefined reference to
> `unregister_dock_notifier'
> drivers/built-in.o: In function
> `register_slot':acpiphp_glue.c:(.text+0x13ac0): undefined reference to
> `is_dock_device'
> :acpiphp_glue.c:(.text+0x13cd9): undefined reference to `is_dock_device'
> :acpiphp_glue.c:(.text+0x13cf0): undefined reference to
> `register_hotplug_dock_device'
> :acpiphp_glue.c:(.text+0x13d1d): undefined reference to 
> `register_dock_notifier'
> make: *** [.tmp_vmlinux1] Error 1
> 
> #
> # PCI Hotplug Support
> #
> CONFIG_HOTPLUG_PCI=y
> CONFIG_HOTPLUG_PCI_FAKE=y
> CONFIG_HOTPLUG_PCI_COMPAQ=y
> # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
> CONFIG_HOTPLUG_PCI_ACPI=y
> CONFIG_HOTPLUG_PCI_ACPI_IBM=y
> CONFIG_HOTPLUG_PCI_CPCI=y
> # CONFIG_HOTPLUG_PCI_CPCI_ZT5550 is not set
> CONFIG_HOTPLUG_PCI_CPCI_GENERIC=y
> CONFIG_HOTPLUG_PCI_SHPC=y
> # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set


You hadn't attached your complete .config, but is it correct when I 
assume you have CONFIG_ACPI_DOCK=m? This would explain the problem.


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

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Miles Lane]

Should I attach my entire .config file in the future?  It's large enough that
I try to trim it to avoid bloating people's inboxes.

Yes, that's right.  It is compiled as a module.  So this just needs
a tweaked config rule, right?

Thanks,
         Miles

On 6/25/06, Adrian Bunk <bunk@stusta.de> wrote:
> On Sun, Jun 25, 2006 at 12:56:44PM -0700, Miles Lane wrote:
> > drivers/built-in.o: In function
> > `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined
> > reference to `is_dock_device'
> > drivers/built-in.o: In function
> > `cleanup_bridge':acpiphp_glue.c:(.text+0x12bc4): undefined reference
> > to `is_dock_device'
> > :acpiphp_glue.c:(.text+0x12bd3): undefined reference to
> > `unregister_hotplug_dock_device'
> > :acpiphp_glue.c:(.text+0x12bdb): undefined reference to
> > `unregister_dock_notifier'
> > drivers/built-in.o: In function
> > `register_slot':acpiphp_glue.c:(.text+0x13ac0): undefined reference to
> > `is_dock_device'
> > :acpiphp_glue.c:(.text+0x13cd9): undefined reference to `is_dock_device'
> > :acpiphp_glue.c:(.text+0x13cf0): undefined reference to
> > `register_hotplug_dock_device'
> > :acpiphp_glue.c:(.text+0x13d1d): undefined reference to
> > `register_dock_notifier'
> > make: *** [.tmp_vmlinux1] Error 1
> >
> > #
> > # PCI Hotplug Support
> > #
> > CONFIG_HOTPLUG_PCI=y
> > CONFIG_HOTPLUG_PCI_FAKE=y
> > CONFIG_HOTPLUG_PCI_COMPAQ=y
> > # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
> > CONFIG_HOTPLUG_PCI_ACPI=y
> > CONFIG_HOTPLUG_PCI_ACPI_IBM=y
> > CONFIG_HOTPLUG_PCI_CPCI=y
> > # CONFIG_HOTPLUG_PCI_CPCI_ZT5550 is not set
> > CONFIG_HOTPLUG_PCI_CPCI_GENERIC=y
> > CONFIG_HOTPLUG_PCI_SHPC=y
> > # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
>
>
> You hadn't attached your complete .config, but is it correct when I
> assume you have CONFIG_ACPI_DOCK=m? This would explain the problem.
>
>
> 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
>
>

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Adrian Bunk]

On Sun, Jun 25, 2006 at 01:13:04PM -0700, Miles Lane wrote:

> Should I attach my entire .config file in the future?  It's large enough 
> that
> I try to trim it to avoid bloating people's inboxes.

I'm often trying to reproduce compile errors, and it's always a pain in 
the ass when I have to construct a complete .config based on such a 
fragment instead of simply using the complete .config of the reporter.

And people for whom a few kB would matter wouldn't subscribe to 
linux-kernel...

> Yes, that's right.  It is compiled as a module.  So this just needs
> a tweaked config rule, right?

It would be a solution to let HOTPLUG_PCI_ACPI depend on
(ACPI_DOCK || ACPI_DOCK=n), or the #if in 
include/acpi/acpi_drivers.h could be changed to
#if defined(CONFIG_ACPI_DOCK) || (defined(CONFIG_ACPI_DOCK_MODULE) && defined(MODULE))

Which one suits better the intention is better is a question Kristen has 
to answer.

> Thanks,
>         Miles

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

ACPI_DOCK bug: noone cares

[Adrian Bunk]

On Sun, Jun 25, 2006 at 10:40:39PM +0200, Adrian Bunk wrote:
> On Sun, Jun 25, 2006 at 01:13:04PM -0700, Miles Lane wrote:
> 
> > Should I attach my entire .config file in the future?  It's large enough 
> > that
> > I try to trim it to avoid bloating people's inboxes.
> 
> I'm often trying to reproduce compile errors, and it's always a pain in 
> the ass when I have to construct a complete .config based on such a 
> fragment instead of simply using the complete .config of the reporter.
> 
> And people for whom a few kB would matter wouldn't subscribe to 
> linux-kernel...
> 
> > Yes, that's right.  It is compiled as a module.  So this just needs
> > a tweaked config rule, right?
> 
> It would be a solution to let HOTPLUG_PCI_ACPI depend on
> (ACPI_DOCK || ACPI_DOCK=n), or the #if in 
> include/acpi/acpi_drivers.h could be changed to
> #if defined(CONFIG_ACPI_DOCK) || (defined(CONFIG_ACPI_DOCK_MODULE) && defined(MODULE))
> 
> Which one suits better the intention is better is a question Kristen has 
> to answer.


Two weeks ago, we had:
- a bug report
- a detailed description how to possibly fix this issue

What we did NOT have was:
- any reaction by the patch author or any maintainer
  (although with the exception of Linus, the recipients of the problem
   description were exactly the same as the ones in this email)

A few days later, the patch that includes this bug was included in 
Linus' tree.

Two weeks later, the bug is still present in both latest -mm and Linus' 
tree.

Linus, please do a
  git-revert a5e1b94008f2a96abf4a0c0371a55a56b320c13e

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

Re: ACPI_DOCK bug: noone cares

[Linus Torvalds]

On Sun, 9 Jul 2006, Adrian Bunk wrote:
> 
> Two weeks ago, we had:
> - a bug report
> - a detailed description how to possibly fix this issue
> 
> What we did NOT have was:
> - any reaction by the patch author or any maintainer
>   (although with the exception of Linus, the recipients of the problem
>    description were exactly the same as the ones in this email)
> 
> A few days later, the patch that includes this bug was included in 
> Linus' tree.
> 
> Two weeks later, the bug is still present in both latest -mm and Linus' 
> tree.
> 
> Linus, please do a
>   git-revert a5e1b94008f2a96abf4a0c0371a55a56b320c13e

Fair enough. Reverted.

I think I'll stop accepting any ACPI patches at all that add new features, 
as long as there doesn't seem to be anybody who reacts to bug-reports. We 
don't need ACPI features.

We need somebody who answers when people like Andrew asks about patches to 
support things like memory hotplug (which was also a problem over the last 
weeks). Here's a quote from Andrew from a week or so ago: "repeat seven 
times over three months with zero response.".

It's not worth it to accept new stuff if we know it's not going to get any 
attention ever afterwards.

			Linus

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Keith Owens]

"Miles Lane" (on Sun, 25 Jun 2006 13:13:04 -0700) wrote:
>Should I attach my entire .config file in the future?  It's large enough that
>I try to trim it to avoid bloating people's inboxes.

Mail the result of

  sed -ne 's/^CONFIG_//p' .config

That is typically less than 40% of the full .config size, and it can be
fully regenerated by

  yes '' | make oldconfig

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Keith Owens]

Keith Owens (on Mon, 26 Jun 2006 15:56:49 +1000) wrote:
>"Miles Lane" (on Sun, 25 Jun 2006 13:13:04 -0700) wrote:
>>Should I attach my entire .config file in the future?  It's large enough that
>>I try to trim it to avoid bloating people's inboxes.
>
>Mail the result of
>
>  sed -ne 's/^CONFIG_//p' .config
>
>That is typically less than 40% of the full .config size, and it can be
>fully regenerated by
>
>  yes '' | make oldconfig

Sorry, that should be

  yes 'n' | make oldconfig

and it turns out that this no longer works.  It used to work with the
old config system, but Kconfig gets confused by choices if the input
.config only has the selected choice and is missing the alternates.
For example, Kconfig accepts this

  CONFIG_X86_PC=y
  # CONFIG_X86_ELAN is not set
  # CONFIG_X86_VOYAGER is not set
  # CONFIG_X86_NUMAQ is not set
  # CONFIG_X86_SUMMIT is not set
  # CONFIG_X86_BIGSMP is not set
  # CONFIG_X86_VISWS is not set
  # CONFIG_X86_GENERICARCH is not set
  # CONFIG_X86_ES7000 is not set
  # CONFIG_M386 is not set
  # CONFIG_M486 is not set
  # CONFIG_M586 is not set
  # CONFIG_M586TSC is not set
  # CONFIG_M586MMX is not set

But will not accept CONFIG_X86_PC=y on its own.  Kconfig insists that
you manually select an option, even though only one valid option has
already been selected.  IOW, .config lines that are commented out
sometimes mean something to Kconfig :(

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Roman Zippel]

Hi,

On Mon, 26 Jun 2006, Keith Owens wrote:

> and it turns out that this no longer works.  It used to work with the
> old config system, but Kconfig gets confused by choices if the input
> .config only has the selected choice and is missing the alternates.
> For example, Kconfig accepts this

Choices are not so much the problem, the problems are default. Once the 
setting is gone, it will fall back to the default, which is not always 
'n'.

bye, Roman

RE: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Brown, Len]

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]


>It would be a solution to let HOTPLUG_PCI_ACPI depend on
>(ACPI_DOCK || ACPI_DOCK=n), or the #if in 
>include/acpi/acpi_drivers.h could be changed to
>#if defined(CONFIG_ACPI_DOCK) || 
>(defined(CONFIG_ACPI_DOCK_MODULE) && defined(MODULE))

CONFIG_HOTPLUG_PCI_ACPI requires CONFIG_ACPI_DOCK.
There are 9 combinations.

DOCK	HPA
n	n	ok
n	y	illegal
n	m	illegal
y	n	ok
y	y	ok
y	m	ok
m	n	ok
m	y	illegal (subject of this thread)
m	m	ok

The patch below handles all these cases:

DOCK	HPA
n	n	builds
n	y	-> y,y
n	m	-> m,m
y	n	builds
y	y	builds
y	m	builds
m	n	builds
m	y	-> m,y
m	m	builds

okay?

-Len

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 222a1cc..e7c955b 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -78,6 +78,7 @@ config HOTPLUG_PCI_IBM
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
 	depends on ACPI && HOTPLUG_PCI
+	select ACPI_DOCK
 	help
 	  Say Y here if you have a system that supports PCI Hotplug
using
 	  ACPI.

[-- Attachment #2: git.diff --]
[-- Type: application/octet-stream, Size: 409 bytes --]

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 222a1cc..e7c955b 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -78,6 +78,7 @@ config HOTPLUG_PCI_IBM
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
 	depends on ACPI && HOTPLUG_PCI
+	select ACPI_DOCK
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
 	  ACPI.

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Adrian Bunk]

On Sun, Jul 09, 2006 at 07:03:23PM -0400, Brown, Len wrote:
> 
> >It would be a solution to let HOTPLUG_PCI_ACPI depend on
> >(ACPI_DOCK || ACPI_DOCK=n), or the #if in 
> >include/acpi/acpi_drivers.h could be changed to
> >#if defined(CONFIG_ACPI_DOCK) || 
> >(defined(CONFIG_ACPI_DOCK_MODULE) && defined(MODULE))
> 
> CONFIG_HOTPLUG_PCI_ACPI requires CONFIG_ACPI_DOCK.
> There are 9 combinations.
> 
> DOCK	HPA
> n	n	ok
> n	y	illegal
> n	m	illegal
> y	n	ok
> y	y	ok
> y	m	ok
> m	n	ok
> m	y	illegal (subject of this thread)
> m	m	ok
> 
> The patch below handles all these cases:
> 
> DOCK	HPA
> n	n	builds
> n	y	-> y,y
> n	m	-> m,m
> y	n	builds
> y	y	builds
> y	m	builds
> m	n	builds
> m	y	-> m,y
> m	m	builds
> 
> okay?

This patch looks wrong since it allows the illegal configuration
ACPI_IBM_DOCK=y, HOTPLUG_PCI_ACPI=y/m, ACPI_DOCK=y/m.

If you select something, you have to ensure the dependencies of what you 
are select'ing are fulfilled.

config HOTPLUG_PCI_ACPI
	tristate "ACPI PCI Hotplug driver"
	depends on ACPI && HOTPLUG_PCI
	depends on !ACPI_IBM_DOCK
	select ACPI_DOCK
	help
	  ...

> -Len
> 
> diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
> index 222a1cc..e7c955b 100644
> --- a/drivers/pci/hotplug/Kconfig
> +++ b/drivers/pci/hotplug/Kconfig
> @@ -78,6 +78,7 @@ config HOTPLUG_PCI_IBM
>  config HOTPLUG_PCI_ACPI
>  	tristate "ACPI PCI Hotplug driver"
>  	depends on ACPI && HOTPLUG_PCI
> +	select ACPI_DOCK
>  	help
>  	  Say Y here if you have a system that supports PCI Hotplug
> using
>  	  ACPI.


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

Re: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Linus Torvalds]

On Mon, 10 Jul 2006, Adrian Bunk wrote:
> 
> This patch looks wrong since it allows the illegal configuration
> ACPI_IBM_DOCK=y, HOTPLUG_PCI_ACPI=y/m, ACPI_DOCK=y/m.

Len?

		Linus

RE: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Brown, Len]

fixed typo -- can't cook and type at the same time...

DOCK	HPA
n	n	builds
n	y	-> y,y
n	m	-> m,m
y	n	builds
y	y	builds
y	m	builds
m	n	builds
m	y	-> y,y (previous note had typo, m,y)
m	m	builds

RE: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Brown, Len]

[-- Attachment #1: Type: text/plain, Size: 1664 bytes --]

>it allows the illegal configuration
>ACPI_IBM_DOCK=y, HOTPLUG_PCI_ACPI=y/m, ACPI_DOCK=y/m.

Hmm, that seems to be an additional pre-existing problem.
Since ACPI_IBM_DOCK is going away, lets put the burden
of depending on ACPI_DOCK=n on it, rather than the reverse.

Lets not use select, since it baffles...
and lets add the EXPERIMENTAL that should be here too.

This works for me:

DOCK	HPA	IBM_DOCK	DOCK,HPA,IBM_DOCK
y	y	y	=> 	y,y,n
y	m	y	=> 	y,m,n
y	n	y	=> 	y,n,n
m	y	y	=> 	m,m,n
m	m	y	=> 	m,m,n
m	n	y	=> 	m,n,n
n	y	y	=> 	n,n,y
n	m	y	=> 	n,n,y
n	n	y	=> 	n,n,y

thanks,
-Len


diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fef7bab..82289f1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -135,8 +135,7 @@ config ACPI_FAN
 
 config ACPI_DOCK
 	tristate "Dock"
-	depends on !ACPI_IBM_DOCK
-	default y
+	depends on EXPERIMENTAL
 	help
 	  This driver adds support for ACPI controlled docking stations
 
@@ -214,6 +213,7 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
 	bool "Legacy Docking Station Support"
 	depends on ACPI_IBM
+	depends on ACPI_DOCK=n
 	default n
 	---help---
 	  Allows the ibm_acpi driver to handle docking station events.
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 222a1cc..d305d21 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -77,7 +77,7 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on ACPI && HOTPLUG_PCI
+	depends on ACPI_DOCK && HOTPLUG_PCI
 	help
 	  Say Y here if you have a system that supports PCI Hotplug
using
 	  ACPI.

[-- Attachment #2: git.diff --]
[-- Type: application/octet-stream, Size: 1021 bytes --]

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fef7bab..82289f1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -135,8 +135,7 @@ config ACPI_FAN
 
 config ACPI_DOCK
 	tristate "Dock"
-	depends on !ACPI_IBM_DOCK
-	default y
+	depends on EXPERIMENTAL
 	help
 	  This driver adds support for ACPI controlled docking stations
 
@@ -214,6 +213,7 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
 	bool "Legacy Docking Station Support"
 	depends on ACPI_IBM
+	depends on ACPI_DOCK=n
 	default n
 	---help---
 	  Allows the ibm_acpi driver to handle docking station events.
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 222a1cc..d305d21 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -77,7 +77,7 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on ACPI && HOTPLUG_PCI
+	depends on ACPI_DOCK && HOTPLUG_PCI
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
 	  ACPI.