[commit] r5996 - trunk/src/southbridge/nvidia/ck804

[repository service]

Author: jakllsch
Date: Wed Oct 27 22:30:32 2010
New Revision: 5996
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5996

Log:
Correct an apparent copy-paste error that shows up at compile time on
boards using ck804_early_setup.c that select CK804_USE_NIC.

Signed-off-by: Jonathan Kollasch 
Acked-by: Peter Stuge

Modified:
   trunk/src/southbridge/nvidia/ck804/ck804_early_setup.c

Modified: trunk/src/southbridge/nvidia/ck804/ck804_early_setup.c
==============================================================================
--- trunk/src/southbridge/nvidia/ck804/ck804_early_setup.c	Wed Oct 27 19:41:40 2010	(r5995)
+++ trunk/src/southbridge/nvidia/ck804/ck804_early_setup.c	Wed Oct 27 22:30:32 2010	(r5996)
@@ -266,11 +266,11 @@
    RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)),
    RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 9, ~(0xff), ((0 << 4) | (1 << 2) | (1 << 0)),
 #if CONFIG_CK804_USE_NIC
-	RES_PCI_IO, PCI_ADDR(0, CK804B_DEVN_BASE +0xa, 0, 0xf8), 0xffffffbf, 0x00000040,
+	RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE +0xa, 0, 0xf8), 0xffffffbf, 0x00000040,
    RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 19, ~(0xff), ((0 << 4) | (1 << 2) | (0 << 0)),
    RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 3,  ~(0xff), ((0 << 4) | (1 << 2) | (0 << 0)),
    RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 3,  ~(0xff), ((0 << 4) | (1 << 2) | (1 << 0)),
-	RES_PCI_IO, PCI_ADDR(CK804B_BUSN, CK804B_DEVN_BASE + 1 , 0, 0xe4), ~(1 << 23), (1 << 23),
+	RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE + 1 , 0, 0xe4), ~(1 << 23), (1 << 23),
 #endif

#if CONFIG_CK804_USE_ACI