diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/microblaze/include/asm/system.h | |
parent | ARM: 6131/1: MAINTAINERS: update for ARM/Gemini (diff) | |
parent | ARM: 6283/1: Remove useless PCIO_BASE definitions (diff) | |
download | linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.tar.xz linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.zip |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/microblaze/include/asm/system.h')
-rw-r--r-- | arch/microblaze/include/asm/system.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index 59efb3fef957..81e1f7d5b4cb 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -12,6 +12,7 @@ #include <asm/registers.h> #include <asm/setup.h> #include <asm/irqflags.h> +#include <asm/cache.h> #include <asm-generic/cmpxchg.h> #include <asm-generic/cmpxchg-local.h> @@ -96,4 +97,11 @@ extern struct dentry *of_debugfs_root; #define arch_align_stack(x) (x) +/* + * MicroBlaze doesn't handle unaligned accesses in hardware. + * + * Based on this we force the IP header alignment in network drivers. + */ +#define NET_IP_ALIGN 2 + #endif /* _ASM_MICROBLAZE_SYSTEM_H */ |