Fix mismerge of ACPI patches
commitf21271edb5406577dc0a062ce3068ef17a09309d
authorVladimir Serbinenko <phcoder@gmail.com>
Thu, 16 Oct 2014 16:00:27 +0000 (16 18:00 +0200)
committerPatrick Georgi <pgeorgi@google.com>
Fri, 17 Oct 2014 07:31:28 +0000 (17 09:31 +0200)
tree7ed818dd82644d61178d105ccbf277e787510ffb
parent833bf20f92c38e8e3dfee12d3b81d47bcd35d906
Fix mismerge of ACPI patches

Change-Id: I2a9960861465f4686113213d5e5793333b6274b2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7079
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
src/northbridge/amd/amdk8/northbridge.c
src/southbridge/amd/amd8111/lpc.c
src/southbridge/amd/sb600/lpc.c
src/southbridge/amd/sb700/lpc.c
src/southbridge/nvidia/ck804/ht.c
src/southbridge/nvidia/ck804/lpc.c
src/southbridge/nvidia/mcp55/ht.c
src/southbridge/nvidia/mcp55/lpc.c
src/southbridge/via/k8t890/traf_ctrl.c