diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-18 00:26:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-18 00:26:44 +0200 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/m68k/include/asm/unaligned.h | |
| parent | ASoC: wm8994: Add bytes controls for DRC (diff) | |
| parent | blackfin: add platform device for ad1836 machine driver (diff) | |
| download | linux-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.xz linux-6bf6d1af86e7dec914f7916f2a00910650a73469.zip | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
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 @@ #define _ASM_M68K_UNALIGNED_H -#if defined(CONFIG_COLDFIRE) || defined(CONFIG_M68000) +#ifdef CONFIG_CPU_HAS_NO_UNALIGNED #include <linux/unaligned/be_struct.h> #include <linux/unaligned/le_byteshift.h> #include <linux/unaligned/generic.h> @@ -12,7 +12,7 @@ #else /* - * The m68k can do unaligned accesses itself. + * The m68k can do unaligned accesses itself. */ #include <linux/unaligned/access_ok.h> #include <linux/unaligned/generic.h> |