diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /target/linux/patches/3.13.6/microblaze-setup.patch | |
parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) |
resolve conflict
Diffstat (limited to 'target/linux/patches/3.13.6/microblaze-setup.patch')
-rw-r--r-- | target/linux/patches/3.13.6/microblaze-setup.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/patches/3.13.6/microblaze-setup.patch b/target/linux/patches/3.13.6/microblaze-setup.patch new file mode 100644 index 000000000..43815f274 --- /dev/null +++ b/target/linux/patches/3.13.6/microblaze-setup.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.11.10.orig/arch/microblaze/kernel/setup.c linux-3.11.10/arch/microblaze/kernel/setup.c +--- linux-3.11.10.orig/arch/microblaze/kernel/setup.c 2013-11-29 19:42:37.000000000 +0100 ++++ linux-3.11.10/arch/microblaze/kernel/setup.c 2013-12-08 13:02:37.000000000 +0100 +@@ -177,7 +177,7 @@ + #else + if (!msr) { + pr_info("!!!Your kernel not setup MSR instruction but "); +- pr_cont"CPU have it %x\n", msr); ++ pr_cont("CPU have it %x\n", msr); + } + #endif + |