projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
[deliverable/linux.git]
/
include
/
linux
/
fb.h
diff --git
a/include/linux/fb.h
b/include/linux/fb.h
index b6bfda99add3c78d7b638a8a3b8f86730f77113f..09bb7a18d28775c676965e94ef28186793839e4a 100644
(file)
--- a/
include/linux/fb.h
+++ b/
include/linux/fb.h
@@
-553,7
+553,7
@@
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
#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__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__)
|| defined(__arm__)
#define fb_readb __raw_readb
#define fb_readw __raw_readw
#define fb_readb __raw_readb
#define fb_readw __raw_readw
This page took
0.064175 seconds
and
5
git commands to generate.