diff options
-rw-r--r-- | drivers/scsi/dtc.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 9d52e45c7d36..da7409ec5a91 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c | |||
@@ -137,11 +137,9 @@ static struct override { | |||
137 | #ifdef OVERRIDE | 137 | #ifdef OVERRIDE |
138 | [] __initdata = OVERRIDE; | 138 | [] __initdata = OVERRIDE; |
139 | #else | 139 | #else |
140 | [4] __initdata = { { | 140 | [4] __initdata = { |
141 | 0, IRQ_AUTO}, { | 141 | { 0, IRQ_AUTO }, { 0, IRQ_AUTO }, { 0, IRQ_AUTO }, { 0, IRQ_AUTO } |
142 | 0, IRQ_AUTO}, { | 142 | }; |
143 | 0, IRQ_AUTO}, { | ||
144 | 0, IRQ_AUTO}}; | ||
145 | #endif | 143 | #endif |
146 | 144 | ||
147 | #define NO_OVERRIDES ARRAY_SIZE(overrides) | 145 | #define NO_OVERRIDES ARRAY_SIZE(overrides) |
@@ -176,7 +174,7 @@ static const struct signature { | |||
176 | * Inputs : str - unused, ints - array of integer parameters with ints[0] | 174 | * Inputs : str - unused, ints - array of integer parameters with ints[0] |
177 | * equal to the number of ints. | 175 | * equal to the number of ints. |
178 | * | 176 | * |
179 | */ | 177 | */ |
180 | 178 | ||
181 | static void __init dtc_setup(char *str, int *ints) | 179 | static void __init dtc_setup(char *str, int *ints) |
182 | { | 180 | { |
@@ -233,7 +231,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) | |||
233 | } else | 231 | } else |
234 | for (; !addr && (current_base < NO_BASES); ++current_base) { | 232 | for (; !addr && (current_base < NO_BASES); ++current_base) { |
235 | #if (DTCDEBUG & DTCDEBUG_INIT) | 233 | #if (DTCDEBUG & DTCDEBUG_INIT) |
236 | printk("scsi-dtc : probing address %08x\n", bases[current_base].address); | 234 | printk(KERN_DEBUG "scsi-dtc : probing address %08x\n", bases[current_base].address); |
237 | #endif | 235 | #endif |
238 | if (bases[current_base].noauto) | 236 | if (bases[current_base].noauto) |
239 | continue; | 237 | continue; |
@@ -244,7 +242,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) | |||
244 | if (check_signature(base + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) { | 242 | if (check_signature(base + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) { |
245 | addr = bases[current_base].address; | 243 | addr = bases[current_base].address; |
246 | #if (DTCDEBUG & DTCDEBUG_INIT) | 244 | #if (DTCDEBUG & DTCDEBUG_INIT) |
247 | printk("scsi-dtc : detected board.\n"); | 245 | printk(KERB_DEBUG "scsi-dtc : detected board.\n"); |
248 | #endif | 246 | #endif |
249 | goto found; | 247 | goto found; |
250 | } | 248 | } |
@@ -253,7 +251,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) | |||
253 | } | 251 | } |
254 | 252 | ||
255 | #if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT) | 253 | #if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT) |
256 | printk("scsi-dtc : base = %08x\n", addr); | 254 | printk(KERN_DEBUG "scsi-dtc : base = %08x\n", addr); |
257 | #endif | 255 | #endif |
258 | 256 | ||
259 | if (!addr) | 257 | if (!addr) |