From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Nov 2013 22:26:38 +0000 (-0800)
Subject: Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux
X-Git-Tag: firefly_0821_release~176^2~4958
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=98d38dd2ee30322fc9934d7490be3c5bee80950e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux

Pull OpenRISC updates from Jonas Bonn:
 - small cleanups to make allmodconfig pass
 - defconfig refresh
 - a handful of code sanitization patches

* tag 'for-3.13' of git://git.openrisc.net/~jonas/linux:
  openrisc: Refactor or32_early_setup()
  openrisc: Remove unused declaration of __initramfs_start
  openrisc: Use the declarations provided by <asm/sections.h>
  openrisc: Refresh or1ksim_defconfig for v3.12
  openrisc: Refactor 16-bit constant relocation
  openrisc: include: asm: Kbuild: add default "vga.h"
  openrisc: Makefile: append "-D__linux__" to KBUILD_CFLAGS
---

98d38dd2ee30322fc9934d7490be3c5bee80950e
diff --cc arch/openrisc/include/asm/Kbuild
index 78405625e799,6bdc2701f028..da1951a22907
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@@ -65,6 -65,6 +65,7 @@@ generic-y += trace_clock.
  generic-y += types.h
  generic-y += ucontext.h
  generic-y += user.h
+ generic-y += vga.h
  generic-y += word-at-a-time.h
  generic-y += xor.h
 +generic-y += preempt.h