diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /drivers/scsi/nsp32_debug.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/nsp32_debug.c')
| -rw-r--r-- | drivers/scsi/nsp32_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/nsp32_debug.c b/drivers/scsi/nsp32_debug.c index ef3c59cbcff6..2fb3fb58858d 100644 --- a/drivers/scsi/nsp32_debug.c +++ b/drivers/scsi/nsp32_debug.c | |||
| @@ -88,7 +88,7 @@ static void print_commandk (unsigned char *command) | |||
| 88 | int i,s; | 88 | int i,s; |
| 89 | // printk(KERN_DEBUG); | 89 | // printk(KERN_DEBUG); |
| 90 | print_opcodek(command[0]); | 90 | print_opcodek(command[0]); |
| 91 | /*printk(KERN_DEBUG "%s ", __FUNCTION__);*/ | 91 | /*printk(KERN_DEBUG "%s ", __func__);*/ |
| 92 | if ((command[0] >> 5) == 6 || | 92 | if ((command[0] >> 5) == 6 || |
| 93 | (command[0] >> 5) == 7 ) { | 93 | (command[0] >> 5) == 7 ) { |
| 94 | s = 12; /* vender specific */ | 94 | s = 12; /* vender specific */ |