projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pnp
/
base.h
diff --git
a/drivers/pnp/base.h
b/drivers/pnp/base.h
index 5e4e82c82659b7e1aadd0db55f38d10e702b7382..0b8d14050efaf2e424b11c5a07515d1c2eb1f6c1 100644
(file)
--- a/
drivers/pnp/base.h
+++ b/
drivers/pnp/base.h
@@
-4,6
+4,7
@@
*/
extern spinlock_t pnp_lock;
*/
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);
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_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);
int pnp_add_card(struct pnp_card *card);
void pnp_remove_card(struct pnp_card *card);
@@
-147,7
+147,7
@@
char *pnp_resource_type_name(struct resource *res);
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
void pnp_free_resources(struct pnp_dev *dev);
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
void pnp_free_resources(struct pnp_dev *dev);
-
int
pnp_resource_type(struct resource *res);
+
unsigned long
pnp_resource_type(struct resource *res);
struct pnp_resource {
struct list_head list;
struct pnp_resource {
struct list_head list;