diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /include/linux/isa.h | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/isa.h')
| -rw-r--r-- | include/linux/isa.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/isa.h b/include/linux/isa.h index 1b855335cb11..b0270e3814c8 100644 --- a/include/linux/isa.h +++ b/include/linux/isa.h | |||
| @@ -22,7 +22,18 @@ struct isa_driver { | |||
| 22 | 22 | ||
| 23 | #define to_isa_driver(x) container_of((x), struct isa_driver, driver) | 23 | #define to_isa_driver(x) container_of((x), struct isa_driver, driver) |
| 24 | 24 | ||
| 25 | #ifdef CONFIG_ISA | ||
| 25 | int isa_register_driver(struct isa_driver *, unsigned int); | 26 | int isa_register_driver(struct isa_driver *, unsigned int); |
| 26 | void isa_unregister_driver(struct isa_driver *); | 27 | void isa_unregister_driver(struct isa_driver *); |
| 28 | #else | ||
| 29 | static inline int isa_register_driver(struct isa_driver *d, unsigned int i) | ||
| 30 | { | ||
| 31 | return 0; | ||
| 32 | } | ||
| 33 | |||
| 34 | static inline void isa_unregister_driver(struct isa_driver *d) | ||
| 35 | { | ||
| 36 | } | ||
| 37 | #endif | ||
| 27 | 38 | ||
| 28 | #endif /* __LINUX_ISA_H */ | 39 | #endif /* __LINUX_ISA_H */ |