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

Merge remote-tracking branch 'grant/devicetree/next' into for-next

Browse Source
This commit is contained in:
Rob Herring
2013-11-07 10:34:46 -06:00
parent e363bbac31 355e62f5ad
commit b5480950c6
505 changed files with 4155 additions and 2570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/include/asm/floppy_64.h
View File

@@ -254,7 +254,7 @@ static int sun_fd_request_irq(void)
once = 1;
error = request_irq(FLOPPY_IRQ, sparc_floppy_irq,
IRQF_DISABLED, "floppy", NULL);
0, "floppy", NULL);
return ((error == 0) ? 0 : -1);
}

2
arch/sparc/include/asm/jump_label.h
View File

@@ -9,7 +9,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
asm goto("1:\n\t"
asm_volatile_goto("1:\n\t"
"nop\n\t"
"nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"