summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/include/mach/system_rev.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2012-01-11 23:11:29 +0400
committerPekka Enberg <penberg@kernel.org>2012-01-11 23:11:29 +0400
commit5878cf431ca7233a56819ca6970153ac0b129599 (patch)
treee5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /arch/arm/mach-at91/include/mach/system_rev.h
parent74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff)
parentb13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff)
downloadlinux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'arch/arm/mach-at91/include/mach/system_rev.h')
-rw-r--r--arch/arm/mach-at91/include/mach/system_rev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/system_rev.h b/arch/arm/mach-at91/include/mach/system_rev.h
index 8f4866045b41..ec164a4124c9 100644
--- a/arch/arm/mach-at91/include/mach/system_rev.h
+++ b/arch/arm/mach-at91/include/mach/system_rev.h
@@ -19,7 +19,7 @@
#define BOARD_HAVE_NAND_16BIT (1 << 31)
static inline int board_have_nand_16bit(void)
{
- return system_rev & BOARD_HAVE_NAND_16BIT;
+ return (system_rev & BOARD_HAVE_NAND_16BIT) ? 1 : 0;
}
#endif /* __ARCH_SYSTEM_REV_H__ */