From ae97276acb8700941644bd48836023b5dae5c816 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 10 Feb 2007 01:45:13 -0800 Subject: [PATCH] --- yaml --- r: 47530 b: refs/heads/master c: cbcdc1debd02e1a2cbc1367ee7e0213e1041f738 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/base.h | 1 - trunk/include/linux/pnp.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2deed496f4ca..f99149a81ad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83f3aa3dc5a5014cb4dc344e503b082344d8fe1e +refs/heads/master: cbcdc1debd02e1a2cbc1367ee7e0213e1041f738 diff --git a/trunk/drivers/pnp/base.h b/trunk/drivers/pnp/base.h index 6b8c4cfd02a6..31a633f65547 100644 --- a/trunk/drivers/pnp/base.h +++ b/trunk/drivers/pnp/base.h @@ -1,4 +1,3 @@ -extern struct bus_type pnp_bus_type; extern spinlock_t pnp_lock; void *pnp_alloc(long size); int pnp_interface_attach_device(struct pnp_dev *dev); diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h index ab8a8dd8d64c..9a5226f0f169 100644 --- a/trunk/include/linux/pnp.h +++ b/trunk/include/linux/pnp.h @@ -352,6 +352,8 @@ struct pnp_protocol { (dev) = protocol_to_pnp_dev((dev)->protocol_list.next)) +extern struct bus_type pnp_bus_type; + #if defined(CONFIG_PNP) /* device management */