diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-arm/arch-s3c2410/dma.h | |
parent | Input: ads7846 - be more compatible with the hwmon framework (diff) | |
parent | libata: kill ATA_ENABLE_PATA (diff) | |
download | linux-b22364c8eec89e6b0c081a237f3b6348df87796f.tar.xz linux-b22364c8eec89e6b0c081a237f3b6348df87796f.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-s3c2410/dma.h')
-rw-r--r-- | include/asm-arm/arch-s3c2410/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-s3c2410/dma.h b/include/asm-arm/arch-s3c2410/dma.h index 7ac224836971..58ffa7ba3c88 100644 --- a/include/asm-arm/arch-s3c2410/dma.h +++ b/include/asm-arm/arch-s3c2410/dma.h @@ -14,7 +14,7 @@ #define __ASM_ARCH_DMA_H __FILE__ #include <linux/sysdev.h> -#include "hardware.h" +#include <asm/hardware.h> /* * This is the maximum DMA address(physical address) that can be DMAd to. |