xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.7-rc6 into char-misc-next

Browse Source
This commit is contained in:
Greg Kroah-Hartman
2012-11-16 18:21:36 -08:00
parent 644a9d3b66 f4a75d2eb7
commit 98c4514ff6
545 changed files with 6377 additions and 3286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/io.h
View File

@@ -64,7 +64,7 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);
static inline void __raw_writew(u16 val, volatile void __iomem *addr)
{
asm volatile("strh %1, %0"
: "+Qo" (*(volatile u16 __force *)addr)
: "+Q" (*(volatile u16 __force *)addr)
: "r" (val));
}
@@ -72,7 +72,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr)
{
u16 val;
asm volatile("ldrh %1, %0"
: "+Qo" (*(volatile u16 __force *)addr),
: "+Q" (*(volatile u16 __force *)addr),
"=r" (val));
return val;
}