Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[net-next-2.6.git] / drivers / pnp / base.h

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 7cc7bf5304aa040cef5d6132642b5dc21d47c347..3b8b9d3cb03d6cc2f8738e67abd145ff09a4285f 100644 (file)
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -4,6 +4,7 @@
  */
 
 extern spinlock_t pnp_lock;
+extern struct device_attribute pnp_interface_attrs[];
 void *pnp_alloc(long size);
 
 int pnp_register_protocol(struct pnp_protocol *protocol);
@@ -16,7 +17,6 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
 
 int pnp_add_device(struct pnp_dev *dev);
 struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
-int pnp_interface_attach_device(struct pnp_dev *dev);
 
 int pnp_add_card(struct pnp_card *card);
 void pnp_remove_card(struct pnp_card *card);