Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fa890d586cc127ce72597ba0a909bfecf784e10c

Authored by Matthew Wilcox
Committed by Linus Torvalds
1 parent 5e41d0d60a
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 11 additions and 0 deletions Side-by-side Diff

... ... @@ -22,8 +22,19 @@
22 22  
23 23 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
24 24  
  25 +#ifdef CONFIG_ISA
25 26 int isa_register_driver(struct isa_driver *, unsigned int);
26 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 39 #endif /* __LINUX_ISA_H */