diff --git a/src/northbridge/via/Makefile.inc b/src/northbridge/via/Makefile.inc
index 7062ea5b52..95ac7ecb79 100644
--- a/src/northbridge/via/Makefile.inc
+++ b/src/northbridge/via/Makefile.inc
@@ -1,6 +1,7 @@
 #subdirs-y += vt8601
 #subdirs-y += vt8623
 #subdirs-y += cn700
-subdirs-y += cx700
+subdirs-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700
+subdirs-$(CONFIG_NORTHBRIDGE_VIA_CN400) += cn400
 #subdirs-y += vx800
 
diff --git a/src/northbridge/via/cn400/Kconfig b/src/northbridge/via/cn400/Kconfig
new file mode 100644
index 0000000000..5df0eb9385
--- /dev/null
+++ b/src/northbridge/via/cn400/Kconfig
@@ -0,0 +1,3 @@
+config NORTHBRIDGE_VIA_CN400
+	bool
+	default n
diff --git a/src/northbridge/via/cn400/Makefile.inc b/src/northbridge/via/cn400/Makefile.inc
new file mode 100644
index 0000000000..032f4b74e2
--- /dev/null
+++ b/src/northbridge/via/cn400/Makefile.inc
@@ -0,0 +1,27 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007 Corey Osgood <corey.osgood@gmail.com>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+obj-y += vgabios.o
+
+driver-y += northbridge.o
+driver-y += agp.o
+driver-y += vga.o
+driver-y += vlink.o
+
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index 1f9e50e993..e616fecab3 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -15,11 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-obj-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700_reset.o
-obj-$(CONFIG_NORTHBRIDGE_VIA_CX700) += northbridge.o
-obj-$(CONFIG_NORTHBRIDGE_VIA_CX700) += vgabios.o
+obj-y += cx700_reset.o
+obj-y += northbridge.o
+obj-y += vgabios.o
 
-driver-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700_agp.o
-driver-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700_lpc.o
-driver-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700_sata.o
-driver-$(CONFIG_NORTHBRIDGE_VIA_CX700) += cx700_vga.o
+driver-y += cx700_agp.o
+driver-y += cx700_lpc.o
+driver-y += cx700_sata.o
+driver-y += cx700_vga.o