diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/pnp/base.h | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/pnp/base.h')
| -rw-r--r-- | drivers/pnp/base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index 4fe7c58f57e9..886dac823ed6 100644 --- a/drivers/pnp/base.h +++ b/drivers/pnp/base.h | |||
| @@ -19,6 +19,7 @@ void pnp_remove_card(struct pnp_card *card); | |||
| 19 | int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev); | 19 | int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev); |
| 20 | void pnp_remove_card_device(struct pnp_dev *dev); | 20 | void pnp_remove_card_device(struct pnp_dev *dev); |
| 21 | 21 | ||
| 22 | struct pnp_option *pnp_build_option(int priority); | ||
| 22 | struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev); | 23 | struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev); |
| 23 | struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev, | 24 | struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev, |
| 24 | int priority); | 25 | int priority); |