diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/ide/ide-timing.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/ide/ide-timing.h')
| -rw-r--r-- | drivers/ide/ide-timing.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h index 3b12ffe77071..2e91c5870b4c 100644 --- a/drivers/ide/ide-timing.h +++ b/drivers/ide/ide-timing.h | |||
| @@ -95,7 +95,6 @@ static struct ide_timing ide_timing[] = { | |||
| 95 | #define IDE_TIMING_UDMA 0x80 | 95 | #define IDE_TIMING_UDMA 0x80 |
| 96 | #define IDE_TIMING_ALL 0xff | 96 | #define IDE_TIMING_ALL 0xff |
| 97 | 97 | ||
| 98 | #define FIT(v,vmin,vmax) max_t(short,min_t(short,v,vmax),vmin) | ||
| 99 | #define ENOUGH(v,unit) (((v)-1)/(unit)+1) | 98 | #define ENOUGH(v,unit) (((v)-1)/(unit)+1) |
| 100 | #define EZ(v,unit) ((v)?ENOUGH(v,unit):0) | 99 | #define EZ(v,unit) ((v)?ENOUGH(v,unit):0) |
| 101 | 100 | ||