diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
| commit | 5d037f9064a8f3b9abbe383cdfb35e159d813711 (patch) | |
| tree | 2a2445271ee818c360c42408a324d2945a6dd9f7 /arch/m68k/include/asm/unaligned.h | |
| parent | 64f1e00d8edb54f5d25fb0114a46050fb8340df4 (diff) | |
| parent | 985b11fa8064d55d0d5a84e68667434598911bb2 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.6
A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel. As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes. There's been good exposure in -next.
The AT91 patch fixes a build break.
Diffstat (limited to 'arch/m68k/include/asm/unaligned.h')
| -rw-r--r-- | arch/m68k/include/asm/unaligned.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h index f4043ae63db1..2b3ca0bf7a0d 100644 --- a/arch/m68k/include/asm/unaligned.h +++ b/arch/m68k/include/asm/unaligned.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define _ASM_M68K_UNALIGNED_H | 2 | #define _ASM_M68K_UNALIGNED_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #if defined(CONFIG_COLDFIRE) || defined(CONFIG_M68000) | 5 | #ifdef CONFIG_CPU_HAS_NO_UNALIGNED |
| 6 | #include <linux/unaligned/be_struct.h> | 6 | #include <linux/unaligned/be_struct.h> |
| 7 | #include <linux/unaligned/le_byteshift.h> | 7 | #include <linux/unaligned/le_byteshift.h> |
| 8 | #include <linux/unaligned/generic.h> | 8 | #include <linux/unaligned/generic.h> |
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #else | 13 | #else |
| 14 | /* | 14 | /* |
| 15 | * The m68k can do unaligned accesses itself. | 15 | * The m68k can do unaligned accesses itself. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/unaligned/access_ok.h> | 17 | #include <linux/unaligned/access_ok.h> |
| 18 | #include <linux/unaligned/generic.h> | 18 | #include <linux/unaligned/generic.h> |