diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /sound/oss/vidc.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'sound/oss/vidc.c')
| -rw-r--r-- | sound/oss/vidc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 12ba28e7b933..92ca5bee1860 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 29 | #include <asm/hardware/iomd.h> | 29 | #include <asm/hardware/iomd.h> |
| 30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
| 31 | #include <asm/system.h> | ||
| 32 | 31 | ||
| 33 | #include "sound_config.h" | 32 | #include "sound_config.h" |
| 34 | #include "vidc.h" | 33 | #include "vidc.h" |