summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform/Makefile
diff options
context:
space:
mode:
authorJun Nakajima <jnakajim@gmail.com>2013-01-21 17:23:09 +0000
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-21 12:09:19 -0800
commitddd70cf93d784af3698c86315aa0ded87ca0a0c5 (patch)
tree68835c5351c42a865fc714abfda52da0416b2660 /arch/x86/platform/Makefile
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff)
goldfish: platform device for x86
Based on code by Jun Nakajima but stripped of all the old x86 mach-foo stuff and turned into a single file for the Goldfish virtual bus layer. The actual created platform device and bus enumeration is portable between the ARM and x86 Goldfish emulations. Signed-off-by: Sheng Yang <sheng@linux.intel.com> Link: http://lkml.kernel.org/r/20130121172205.19517.22535.stgit@bob.linux.org.uk Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> [Ported to 3.7 and reorganised so that we can keep most of the code shared properly] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Diffstat (limited to 'arch/x86/platform/Makefile')
-rw-r--r--arch/x86/platform/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 8d874396cb2..bfe917f4f69 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -2,6 +2,7 @@
obj-y += ce4100/
obj-y += efi/
obj-y += geode/
+obj-y += goldfish/
obj-y += iris/
obj-y += mrst/
obj-y += olpc/