diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /arch/cris/arch-v32/kernel/cache.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'arch/cris/arch-v32/kernel/cache.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/cache.c b/arch/cris/arch-v32/kernel/cache.c index 80da7b88a72b..f38433b1f861 100644 --- a/arch/cris/arch-v32/kernel/cache.c +++ b/arch/cris/arch-v32/kernel/cache.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <asm/io.h> | 2 | #include <asm/io.h> |
| 3 | #include <asm/arch/cache.h> | 3 | #include <arch/cache.h> |
| 4 | #include <asm/arch/hwregs/dma.h> | 4 | #include <arch/hwregs/dma.h> |
| 5 | 5 | ||
| 6 | /* This file is used to workaround a cache bug, Guinness TR 106. */ | 6 | /* This file is used to workaround a cache bug, Guinness TR 106. */ |
| 7 | 7 | ||