diff options
| author | Matthew Wilcox <willy@debian.org> | 2003-09-20 20:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-20 20:20:02 -0700 |
| commit | 972b4a74dcacecc9ae50fa46daa10d4efcaef4d1 (patch) | |
| tree | 7df8c5dc5563327e164529b96f17b0d3a78e7361 /include/linux/eisa.h | |
| parent | 87a6ea5a476f8add51faa6ac422be9b6875f4e9d (diff) | |
[PATCH] Move EISA_bus
When I change the setting of CONFIG_EISA, everything rebuilds. This is
because EISA_bus is declared in <asm/processor.h> which is implicitly
included by just about everything. This is a silly place to declare it,
so this patch moves it to include/linux/eisa.h.
While I'm at it, I also move the variable definition to
drivers/eisa/eisa-bus.c. The rest of this patch is fixing up the fallout
from having to include <linux/eisa.h> if you use EISA_bus.
Diffstat (limited to 'include/linux/eisa.h')
| -rw-r--r-- | include/linux/eisa.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/eisa.h b/include/linux/eisa.h index 2ef648847879..dc76d57b10d0 100644 --- a/include/linux/eisa.h +++ b/include/linux/eisa.h @@ -1,6 +1,19 @@ #ifndef _LINUX_EISA_H #define _LINUX_EISA_H +#include <linux/ioport.h> +#include <linux/device.h> + +#ifdef CONFIG_EISA +# ifdef CONFIG_EISA_ALWAYS +# define EISA_bus 1 +# else + extern int EISA_bus; +# endif +#else +# define EISA_bus 0 +#endif + #define EISA_SIG_LEN 8 #define EISA_MAX_SLOTS 8 |