From 254e73e9e683c8523f34f33cb0ab4f8675620030 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 28 Apr 2008 16:33:51 -0600 Subject: [PATCH] --- yaml --- r: 95545 b: refs/heads/master c: 1692b27bf37826f85f9c12f8468848885643532a h: refs/heads/master i: 95543: d8fec87644d96f0167ef713f58a5b2ab6bd9b7c7 v: v3 --- [refs] | 2 +- trunk/drivers/pnp/base.h | 1 + trunk/drivers/pnp/pnpacpi/core.c | 1 + trunk/drivers/pnp/pnpbios/core.c | 1 + trunk/include/linux/pnp.h | 2 -- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4210ec784b57..de0a37b37f73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a490498643ea37520c315769b293085b6018ddd +refs/heads/master: 1692b27bf37826f85f9c12f8468848885643532a diff --git a/trunk/drivers/pnp/base.h b/trunk/drivers/pnp/base.h index 31a633f65547..abefcc351521 100644 --- a/trunk/drivers/pnp/base.h +++ b/trunk/drivers/pnp/base.h @@ -1,5 +1,6 @@ extern spinlock_t pnp_lock; void *pnp_alloc(long size); +int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev); int pnp_interface_attach_device(struct pnp_dev *dev); void pnp_fixup_device(struct pnp_dev *dev); void pnp_free_option(struct pnp_option *option); diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c index 53f91068d0b0..4807d76f8a04 100644 --- a/trunk/drivers/pnp/pnpacpi/core.c +++ b/trunk/drivers/pnp/pnpacpi/core.c @@ -25,6 +25,7 @@ #include #include +#include "../base.h" #include "pnpacpi.h" static int num = 0; diff --git a/trunk/drivers/pnp/pnpbios/core.c b/trunk/drivers/pnp/pnpbios/core.c index a8a51500e1e9..2a5353bceb24 100644 --- a/trunk/drivers/pnp/pnpbios/core.c +++ b/trunk/drivers/pnp/pnpbios/core.c @@ -69,6 +69,7 @@ #include #include +#include "../base.h" #include "pnpbios.h" /* diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h index b2f05c230f4b..9a05ab5515b6 100644 --- a/trunk/include/linux/pnp.h +++ b/trunk/include/linux/pnp.h @@ -403,7 +403,6 @@ void pnp_resource_change(struct resource *resource, resource_size_t start, /* protocol helpers */ int pnp_is_active(struct pnp_dev *dev); int compare_pnp_id(struct pnp_id *pos, const char *id); -int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev); int pnp_register_driver(struct pnp_driver *drv); void pnp_unregister_driver(struct pnp_driver *drv); @@ -450,7 +449,6 @@ static inline void pnp_resource_change(struct resource *resource, resource_size_ /* protocol helpers */ static inline int pnp_is_active(struct pnp_dev *dev) { return 0; } static inline int compare_pnp_id(struct pnp_id *pos, const char *id) { return -ENODEV; } -static inline int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) { return -ENODEV; } static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; } static inline void pnp_unregister_driver(struct pnp_driver *drv) { }