diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-09-16 17:01:26 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-16 21:13:58 -0700 |
| commit | fa890d586cc127ce72597ba0a909bfecf784e10c (patch) | |
| tree | fa29dd1f6e0385b6193b11207f5bfd0a674d4979 /include/linux | |
| parent | 5e41d0d60a534d2a5dc9772600a58f44c8d12506 (diff) | |
| download | linux-3.10-fa890d586cc127ce72597ba0a909bfecf784e10c.tar.gz linux-3.10-fa890d586cc127ce72597ba0a909bfecf784e10c.tar.bz2 linux-3.10-fa890d586cc127ce72597ba0a909bfecf784e10c.zip | |
Fix non-ISA link error in drivers/scsi/advansys.c
When CONFIG_ISA is disabled, the isa_driver support will not be compiled
in. Define stubs so that we don't get link-time errors.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -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 1b855335cb1..b0270e3814c 100644 --- a/include/linux/isa.h +++ b/include/linux/isa.h @@ -22,7 +22,18 @@ struct isa_driver { #define to_isa_driver(x) container_of((x), struct isa_driver, driver) +#ifdef CONFIG_ISA int isa_register_driver(struct isa_driver *, unsigned int); void isa_unregister_driver(struct isa_driver *); +#else +static inline int isa_register_driver(struct isa_driver *d, unsigned int i) +{ + return 0; +} + +static inline void isa_unregister_driver(struct isa_driver *d) +{ +} +#endif #endif /* __LINUX_ISA_H */ |