diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/aoa/soundbus/soundbus.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/aoa/soundbus/soundbus.h')
| -rw-r--r-- | sound/aoa/soundbus/soundbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h index 622cd37a0118..a0f223c13f66 100644 --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef __SOUNDBUS_H | 8 | #ifndef __SOUNDBUS_H |
| 9 | #define __SOUNDBUS_H | 9 | #define __SOUNDBUS_H |
| 10 | 10 | ||
| 11 | #include <asm/of_device.h> | 11 | #include <linux/of_device.h> |
| 12 | #include <sound/pcm.h> | 12 | #include <sound/pcm.h> |
| 13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 14 | 14 | ||