Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68843
b: refs/heads/master
c: 1fbe852
h: refs/heads/master
i:
  68841: 9e9972e
  68839: 0fed588
v: v3
  • Loading branch information
Alan Cox authored and James Bottomley committed Oct 12, 2007
1 parent a771aa9 commit bb18432
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f8bf7e64ef76e1de66eb5212cd50f6a294d459f
refs/heads/master: 1fbe85292f50ce6186619b83ed04d1bb91dda569
16 changes: 7 additions & 9 deletions trunk/drivers/scsi/dtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,9 @@ static struct override {
#ifdef OVERRIDE
[] __initdata = OVERRIDE;
#else
[4] __initdata = { {
0, IRQ_AUTO}, {
0, IRQ_AUTO}, {
0, IRQ_AUTO}, {
0, IRQ_AUTO}};
[4] __initdata = {
{ 0, IRQ_AUTO }, { 0, IRQ_AUTO }, { 0, IRQ_AUTO }, { 0, IRQ_AUTO }
};
#endif

#define NO_OVERRIDES ARRAY_SIZE(overrides)
Expand Down Expand Up @@ -176,7 +174,7 @@ static const struct signature {
* Inputs : str - unused, ints - array of integer parameters with ints[0]
* equal to the number of ints.
*
*/
*/

static void __init dtc_setup(char *str, int *ints)
{
Expand Down Expand Up @@ -233,7 +231,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
} else
for (; !addr && (current_base < NO_BASES); ++current_base) {
#if (DTCDEBUG & DTCDEBUG_INIT)
printk("scsi-dtc : probing address %08x\n", bases[current_base].address);
printk(KERN_DEBUG "scsi-dtc : probing address %08x\n", bases[current_base].address);
#endif
if (bases[current_base].noauto)
continue;
Expand All @@ -244,7 +242,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
if (check_signature(base + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) {
addr = bases[current_base].address;
#if (DTCDEBUG & DTCDEBUG_INIT)
printk("scsi-dtc : detected board.\n");
printk(KERB_DEBUG "scsi-dtc : detected board.\n");
#endif
goto found;
}
Expand All @@ -253,7 +251,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
}

#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT)
printk("scsi-dtc : base = %08x\n", addr);
printk(KERN_DEBUG "scsi-dtc : base = %08x\n", addr);
#endif

if (!addr)
Expand Down

0 comments on commit bb18432

Please sign in to comment.