2 files changed, 9 insertions, 38 deletions

diff --git a/src/mainboard/via/epia-m/chip.h b/src/mainboard/via/epia-m/chip.h
index 03b13482e2..7b62d6d50b 100644
--- a/src/mainboard/via/epia-m/chip.h
+++ b/src/mainboard/via/epia-m/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control mainboard_via_epia_m_control;
+extern struct chip_operations mainboard_via_epia_m_control;
 
 struct mainboard_via_epia_m_config {
 	int nothing;
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index 443a7cbf3d..a278af7fff 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -47,51 +47,22 @@ void write_protect_vgabios(void)
  
 }
 
-static void
-enable(struct chip *chip, enum chip_pass pass)
-{
-
-        struct mainboard_tyan_s4882_config *conf = 
-		(struct mainboard_tyan_s4882_config *)chip->chip_info;
-
-        switch (pass) {
-		default: break;
-//		case CONF_PASS_PRE_CONSOLE:
-//		case CONF_PASS_PRE_PCI:
-		case CONF_PASS_POST_PCI:		
-//                case CONF_PASS_PRE_BOOT:
-//			if (conf->fixup_scsi)
-//        			onboard_scsi_fixup();
-//			if (conf->fixup_vga)
-//				vga_fixup();
-			printk_debug("mainboard fixup pass %d done\r\n",
-					pass);
-			break;
-	}
-
-}
 static struct device_operations mainboard_operations = {
 	.read_resources   = root_dev_read_resources,
 	.set_resources    = root_dev_set_resources,
-	.enable_resources = enable_childrens_resources,
-	.init             = 0,
+	.enable_resources = root_dev_enable_resources,
+	.init             = root_dev_init,
 	.scan_bus         = mainboard_scan_bus,
 	.enable           = 0,
 };
 
-static void enumerate(struct chip *chip)
+static void enable_dev(device_t dev)
 {
-	struct chip *child;
-	dev_root.ops = &mainboard_operations;
-	chip->dev = &dev_root;
-	chip->bus = 0;
-	for(child = chip->children; child; child = child->next) {
-		child->bus = &dev_root.link[0];
-	}
+	dev->ops = &mainboard_operations;
 }
-struct chip_control mainboard_via_epia_m_control = {
-	.enumerate = enumerate, 
-	.name      = "VIA EPIA-M mainboard ",
-	.enable = enable
+
+struct chip_operations mainboard_via_epia_m_control = {
+	.enable_dev = enable_dev, 
+	.name       = "VIA EPIA-M mainboard ",
 };