KVM: PPC: add CPU_FTR_EMB_HV to CPU table
authorScott Wood <scottwood@freescale.com>
Wed, 11 Apr 2012 20:27:52 +0000 (15:27 -0500)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 12 Apr 2012 01:00:48 +0000 (22:00 -0300)
commit9de6fe91afcdc38efe398a9d42014a7c920a64db
tree1dc84332941fee958cb623555df39d3c248466b0
parent1e3f42f03c38c29c1814199a6f0a2f01b919ea3f
KVM: PPC: add CPU_FTR_EMB_HV to CPU table

e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f,
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/powerpc/include/asm/cputable.h