diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /sound/oss/vidc_fill.S | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | op-kernel-dev-cf206bffbb7542df54043fad9898113172af99d8.zip op-kernel-dev-cf206bffbb7542df54043fad9898113172af99d8.tar.gz | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'sound/oss/vidc_fill.S')
| -rw-r--r-- | sound/oss/vidc_fill.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S index 01ccc07..bed3492 100644 --- a/sound/oss/vidc_fill.S +++ b/sound/oss/vidc_fill.S @@ -11,7 +11,7 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iomd.h> .text |
