On Wed, 2009-12-16 at 23:52 +0800, Bjorn Helgaas wrote:
> On Wednesday 16 December 2009 07:40:29 am yakui.zhao@xxxxxxxxx wrote:
> > From: Zhao Yakui <yakui.zhao@xxxxxxxxx>
> >
> > When the IPMI module is selected as module, it will complain the
> > following building error.
> > >ERROR: "pnpacpi_protocol" [drivers/char/ipmi/ipmi_si.ko] undefined!
> >
> > Fix the above building error.
>
> This is already fixed in Len's tree, so we don't need this patch.
Yes. Just now I checked Len's tree and this is already fixed.
Thanks.
>
> > Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx>
> > cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
> > ---
> > drivers/pnp/pnpacpi/core.c | 7 +++++++
> > include/linux/pnp.h | 11 +++--------
> > 2 files changed, 10 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
> > index 8dd0f37..8eebbe4 100644
> > --- a/drivers/pnp/pnpacpi/core.c
> > +++ b/drivers/pnp/pnpacpi/core.c
> > @@ -155,6 +155,13 @@ struct pnp_protocol pnpacpi_protocol = {
> > #endif
> > };
> >
> > +struct acpi_device *pnp_acpi_device(struct pnp_dev *dev)
> > +{
> > + if (dev->protocol == &pnpacpi_protocol)
> > + return dev->data;
> > + return NULL;
> > +}
> > +EXPORT_SYMBOL_GPL(pnp_acpi_device);
> > static int __init pnpacpi_add_device(struct acpi_device *device)
> > {
> > acpi_handle temp = NULL;
> > diff --git a/include/linux/pnp.h b/include/linux/pnp.h
> > index 7c4193e..0ae2c64 100644
> > --- a/include/linux/pnp.h
> > +++ b/include/linux/pnp.h
> > @@ -335,16 +335,11 @@ extern struct pnp_protocol pnpbios_protocol;
> > #endif
> >
> > #ifdef CONFIG_PNPACPI
> > -extern struct pnp_protocol pnpacpi_protocol;
> >
> > -static inline struct acpi_device *pnp_acpi_device(struct pnp_dev *dev)
> > -{
> > - if (dev->protocol == &pnpacpi_protocol)
> > - return dev->data;
> > - return NULL;
> > -}
> > +extern struct acpi_device *pnp_acpi_device(struct pnp_dev *dev);
> > #else
> > -#define pnp_acpi_device(dev) 0
> > +static inline struct acpi_device *pnp_acpi_device(struct pnp_dev *dev)
> > +{ return NULL; }
> > #endif
> >
> > /* status */
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
