From: Matthew Wilcox <matthew@wil.cx> Date: Sun, 16 Sep 2007 23:01:26 +0000 (-0600) Subject: Fix non-ISA link error in drivers/scsi/advansys.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fa890d586cc127ce72597ba0a909bfecf784e10c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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> --- 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 { #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 */