diff --git a/[refs] b/[refs] index a8d402fae6f1..8dbce913dc20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4466b20cfcfa718ff515b9e3886749cc025e2005 +refs/heads/master: 209aa4fdc39eacc145a7f9c32a4b9ffcc68912c6 diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h index 75a81eaf3430..1ee63df5be92 100644 --- a/trunk/include/linux/fb.h +++ b/trunk/include/linux/fb.h @@ -888,7 +888,7 @@ struct fb_info { #define fb_writeq sbus_writeq #define fb_memset sbus_memset_io -#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__) +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) #define fb_readb __raw_readb #define fb_readw __raw_readw