git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
zorro
/
zorro.c
diff --git
a/drivers/zorro/zorro.c
b/drivers/zorro/zorro.c
index
6d70b40
..
0f2b406
100644
(file)
--- 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/init.h>
#include <linux/zorro.h>
#include <linux/bitops.h>
+#include <linux/string.h>
+
#include <asm/setup.h>
#include <asm/amigahw.h>
#include <asm/setup.h>
#include <asm/amigahw.h>
@@
-134,7
+136,7
@@
static int __init zorro_init(void)
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
return 0;
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
return 0;
- pr
intk
("Zorro: Probing AutoConfig expansion devices: %d device%s\n",
+ pr
_info
("Zorro: Probing AutoConfig expansion devices: %d device%s\n",
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
/* Initialize the Zorro bus */
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
/* Initialize the Zorro bus */