diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-01 03:26:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-01 03:26:34 -0700 |
| commit | 928ce049ddadd85a204bd5c73def1e5c0155ba74 (patch) | |
| tree | 4190cb4067017f4f00140a2d7cf2cf9b6277830c /include/linux | |
| parent | 7d9ace4c20a6ca78581c6cd330040c1870d019cb (diff) | |
| parent | 997b00dd2e545f4649face1b5abdb7341028f256 (diff) | |
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 590f4ed1069e..f6a39379ada9 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -52,13 +52,6 @@ #define OK_TO_RESET_CONTROLLER 1 /* 0 for use with AH2372A/B interface */ #endif -#ifdef CONFIG_BLK_DEV_CMD640 -#if 0 /* change to 1 when debugging cmd640 problems */ -void cmd640_dump_regs (void); -#define CMD640_DUMP_REGS cmd640_dump_regs() /* for debugging cmd640 chipset */ -#endif -#endif /* CONFIG_BLK_DEV_CMD640 */ - #ifndef DISABLE_IRQ_NOSYNC #define DISABLE_IRQ_NOSYNC 0 #endif |