diff options
author | Wolfgang Denk <wd@denx.de> | 2011-10-12 22:42:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-10-12 22:42:28 +0200 |
commit | 37eefe80bb3f1cc25dc8b10f2b7d0b8077e60e09 (patch) | |
tree | a05c0cc1131832e6f7449d7e06e784348aae3b1f /arch/microblaze/include/asm/unaligned.h | |
parent | 2d4afd493b35e1a3b84cbf0a3098977c9f9b57ca (diff) | |
parent | 2267e2d132b6c5edb3312a85da1a2523437a4532 (diff) | |
download | u-boot-imx-37eefe80bb3f1cc25dc8b10f2b7d0b8077e60e09.zip u-boot-imx-37eefe80bb3f1cc25dc8b10f2b7d0b8077e60e09.tar.gz u-boot-imx-37eefe80bb3f1cc25dc8b10f2b7d0b8077e60e09.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Copy bootfile from variables
microblaze: Fix unaligned.h for endians
microblaze: Initialize jumptable and console
microblaze: Support flashes on lower addresses
microblaze: Call common console_init_f initialization function
Diffstat (limited to 'arch/microblaze/include/asm/unaligned.h')
-rw-r--r-- | arch/microblaze/include/asm/unaligned.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/microblaze/include/asm/unaligned.h b/arch/microblaze/include/asm/unaligned.h index 785c2e9..6cecbbb 100644 --- a/arch/microblaze/include/asm/unaligned.h +++ b/arch/microblaze/include/asm/unaligned.h @@ -1,16 +1 @@ -#ifndef _ASM_MICROBLAZE_UNALIGNED_H -#define _ASM_MICROBLAZE_UNALIGNED_H - -#ifdef __KERNEL__ - -/* - * The Microblaze can do unaligned accesses itself in big endian mode. - */ -#include <linux/unaligned/access_ok.h> -#include <linux/unaligned/generic.h> - -#define get_unaligned __get_unaligned_be -#define put_unaligned __put_unaligned_be - -#endif /* __KERNEL__ */ -#endif /* _ASM_MICROBLAZE_UNALIGNED_H */ +#include <asm-generic/unaligned.h> |