Commit 27d0567a authored by Ingo Molnar's avatar Ingo Molnar Committed by Len Brown

ACPI: fix ACPI=n allmodconfig build

Today's -tip failed to build because commit
9e368fa0 ("ipmi: add PNP discovery (ACPI
namespace via PNPACPI)") from today's upstream kernel causes the following
build failure on x86, for CONFIG_ACPI=n && CONFIG_IPMI_SI=y:

 drivers/char/ipmi/ipmi_si_intf.c:3208: error: 'ipmi_pnp_driver' undeclared (first use in this function)
 drivers/char/ipmi/ipmi_si_intf.c:3208: error: (Each undeclared identifier is reported only once
 drivers/char/ipmi/ipmi_si_intf.c:3208: error: for each function it appears in.)
 drivers/char/ipmi/ipmi_si_intf.c:3334: error: 'ipmi_pnp_driver' undeclared (first use in this function)

The reason is that the ipmi_pnp_driver depends on ACPI facilities and is only
made available under ACPI - while the registration and unregistration is made
dependent on CONFIG_PNP:

 #ifdef CONFIG_PNP
 	pnp_register_driver(&ipmi_pnp_driver);
 #endif

The solution is to only register this driver under ACPI. (Also, the CONFIG_PNP
dependency is not needed because pnp_register_driver() is stubbed out in the
!CONFIG_PNP case.)
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarMyron Stowe <myron.stowe@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 6b7b2849
...@@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void) ...@@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
spmi_find_bmc(); spmi_find_bmc();
#endif #endif
#ifdef CONFIG_PNP #ifdef CONFIG_ACPI
pnp_register_driver(&ipmi_pnp_driver); pnp_register_driver(&ipmi_pnp_driver);
#endif #endif
...@@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void) ...@@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
pci_unregister_driver(&ipmi_pci_driver); pci_unregister_driver(&ipmi_pci_driver);
#endif #endif
#ifdef CONFIG_PNP #ifdef CONFIG_ACPI
pnp_unregister_driver(&ipmi_pnp_driver); pnp_unregister_driver(&ipmi_pnp_driver);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment