diff options
author | Tony Luck <tony.luck@intel.com> | 2005-10-31 19:51:57 +0100 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-10-31 19:51:57 +0100 |
commit | c7fb577e2a6cb04732541f2dc402bd46747f7558 (patch) | |
tree | df3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /drivers/zorro/zorro.c | |
parent | Update from upstream with manual merge of Yasunori Goto's (diff) | |
parent | [PATCH] noop-iosched: avoid corrupted request merging (diff) | |
download | linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.tar.xz linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.zip |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/zorro/zorro.c')
-rw-r--r-- | drivers/zorro/zorro.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index d3c05dfe20d2..0f2b40605b06 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -16,6 +16,8 @@ #include <linux/init.h> #include <linux/zorro.h> #include <linux/bitops.h> +#include <linux/string.h> + #include <asm/setup.h> #include <asm/amigahw.h> |