diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 19:04:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 19:04:21 -0800 |
| commit | 06aa5b4aae223ea4d623dc68e85466174bb92c84 (patch) | |
| tree | 22b40cd55396e5329fe8cf69907a1af13145f8bd /include | |
| parent | c91a32503d9ff8079cc45fa743d428fd705042dd (diff) | |
| parent | b2e569d876e153365b01525a102b7d90bb309446 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] ARC: Fix several compiler warnings.
[MIPS] ISA: Fix typo
[CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h index e06ef0776d4..833437d31ef 100644 --- a/include/asm-mips/dma.h +++ b/include/asm-mips/dma.h @@ -74,7 +74,7 @@ * */ -#ifndef GENERIC_ISA_DMA_SUPPORT_BROKEN +#ifndef CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN #define MAX_DMA_CHANNELS 8 #endif |