diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /drivers/scsi/nsp32.h | |
| parent | ab7476cf76e560f0efda2a631a70aabe93009025 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/nsp32.h')
| -rw-r--r-- | drivers/scsi/nsp32.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h index 6715ecb3bfca..9565acf1aa72 100644 --- a/drivers/scsi/nsp32.h +++ b/drivers/scsi/nsp32.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _NSP32_H | 16 | #ifndef _NSP32_H |
| 17 | #define _NSP32_H | 17 | #define _NSP32_H |
| 18 | 18 | ||
| 19 | #include <linux/version.h> | ||
| 20 | //#define NSP32_DEBUG 9 | 19 | //#define NSP32_DEBUG 9 |
| 21 | 20 | ||
| 22 | /* | 21 | /* |