diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:08 -0500 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:08 -0500 |
| commit | 4ee06b7e677da4c75f2fcc5fd850543852d18bf2 (patch) | |
| tree | 0c7c4b1e2be3179cc25e95f4148577cd9047e398 /include/linux | |
| parent | f1ca6d37f991347b87d86430db42e2ab139d1b1d (diff) | |
ide: remove stale ide.h "configuration options"
Remove stale ide.h "configuration options":
* INITIAL_MULT_COUNT - always defined to 0
* SUPPORT_SLOW_DATA_PORTS - unused
* OK_TO_RESET_CONTROLLER - always defined to 1
* DISABLE_IRQ_NOSYNC - always defined to 0
Leave SUPPORT_VLB_SYNC (defined to 0 for CRIS and FRV, otherwise to 1)
for now but disallow overriding it by <asm/ide.h>.
There should be no functionality changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 6dfee2a46f1b..0b088f18d422 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -27,25 +27,10 @@ | |||
| 27 | #include <asm/semaphore.h> | 27 | #include <asm/semaphore.h> |
| 28 | #include <asm/mutex.h> | 28 | #include <asm/mutex.h> |
| 29 | 29 | ||
| 30 | /****************************************************************************** | 30 | #if defined(CRIS) || defined(FRV) |
| 31 | * IDE driver configuration options (play with these as desired): | 31 | # define SUPPORT_VLB_SYNC 0 |
| 32 | * | 32 | #else |
| 33 | * REALLY_SLOW_IO can be defined in ide.c and ide-cd.c, if necessary | 33 | # define SUPPORT_VLB_SYNC 1 |
| 34 | */ | ||
| 35 | #define INITIAL_MULT_COUNT 0 /* off=0; on=2,4,8,16,32, etc.. */ | ||
| 36 | |||
| 37 | #ifndef SUPPORT_SLOW_DATA_PORTS /* 1 to support slow data ports */ | ||
| 38 | #define SUPPORT_SLOW_DATA_PORTS 1 /* 0 to reduce kernel size */ | ||
| 39 | #endif | ||
| 40 | #ifndef SUPPORT_VLB_SYNC /* 1 to support weird 32-bit chips */ | ||
| 41 | #define SUPPORT_VLB_SYNC 1 /* 0 to reduce kernel size */ | ||
| 42 | #endif | ||
| 43 | #ifndef OK_TO_RESET_CONTROLLER /* 1 needed for good error recovery */ | ||
| 44 | #define OK_TO_RESET_CONTROLLER 1 /* 0 for use with AH2372A/B interface */ | ||
| 45 | #endif | ||
| 46 | |||
| 47 | #ifndef DISABLE_IRQ_NOSYNC | ||
| 48 | #define DISABLE_IRQ_NOSYNC 0 | ||
| 49 | #endif | 34 | #endif |
| 50 | 35 | ||
| 51 | /* | 36 | /* |
| @@ -55,10 +40,6 @@ | |||
| 55 | 40 | ||
| 56 | #define IDE_NO_IRQ (-1) | 41 | #define IDE_NO_IRQ (-1) |
| 57 | 42 | ||
| 58 | /* | ||
| 59 | * "No user-serviceable parts" beyond this point :) | ||
| 60 | *****************************************************************************/ | ||
| 61 | |||
| 62 | typedef unsigned char byte; /* used everywhere */ | 43 | typedef unsigned char byte; /* used everywhere */ |
| 63 | 44 | ||
| 64 | /* | 45 | /* |