Merge tag 'fbdev-v4.16' of git://github.com/bzolnier/linux

[linux-2.6-block.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index d1e5bed39140e60ef81632e9357d57f4839ac877..f577d3c896184bed0c9d20d3e3db59583f64ce0d 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -569,7 +569,10 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
 #define fb_memcpy_fromfb sbus_memcpy_fromio
 #define fb_memcpy_tofb sbus_memcpy_toio
 
-#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) || defined(__arm__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) ||        \
+       defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \
+       defined(__avr32__) || defined(__bfin__) || defined(__arm__) ||  \
+       defined(__aarch64__)
 
 #define fb_readb __raw_readb
 #define fb_readw __raw_readw