aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:13:31 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:13:31 -0300
commit039352121f77c59f3017121f3658c4a034a2870c (patch)
treee84e693b8850561020b692ba29add947ec32b681 /Makefile.hw
parentMerge commit '91880d96a188ed88a1762b6648fb452b3eea845e' into upstream-merge (diff)
parentGenerate config-devices.h (diff)
downloadqemu-kvm-039352121f77c59f3017121f3658c4a034a2870c.tar.gz
qemu-kvm-039352121f77c59f3017121f3658c4a034a2870c.tar.bz2
qemu-kvm-039352121f77c59f3017121f3658c4a034a2870c.zip
Merge commit 'fe0d4d3f7769d5b024e8166fc075148f9cf76ba9' into upstream-merge
* commit 'fe0d4d3f7769d5b024e8166fc075148f9cf76ba9': Generate config-devices.h Add new config-devices.mak for each target Conflicts: Makefile Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.hw')
-rw-r--r--Makefile.hw1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.hw b/Makefile.hw
index dcb61aaf8..21e33647b 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -1,6 +1,7 @@
# Makefile for qemu target independent devices.
include ../config-host.mak
+include ../config-all-devices.mak
include config.mak
include $(SRC_PATH)/rules.mak