diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 11:53:06 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 11:53:06 (GMT) |
| commit | 61eab000f3536f080eab43fd5eed3fd817ded76e (patch) | |
| tree | d1448b3b90c5650b522c8d13d8bdd7bd65a5cf52 /arch/sh/include/asm/shmbuf.h | |
| parent | 68e67f40b7343383517c3f951b4b8db7626406bc (diff) | |
| parent | 4e01ec636e64707d202a1ca21a47bbc6d53085b7 (diff) | |
| download | linux-fsl-qoriq-61eab000f3536f080eab43fd5eed3fd817ded76e.tar.xz | |
Merge branch 'topic/hda' into for-next
This is a large chunk merge for 3.6 HD-audio things
Diffstat (limited to 'arch/sh/include/asm/shmbuf.h')
| -rw-r--r-- | arch/sh/include/asm/shmbuf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/shmbuf.h b/arch/sh/include/asm/shmbuf.h deleted file mode 100644 index 83c05fc..0000000 --- a/arch/sh/include/asm/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/shmbuf.h> |