diff --git a/src/northbridge/transmeta/tm5800/Config.lb b/src/northbridge/transmeta/tm5800/Config.lb
index c4ed559da3..fab87f8eeb 100644
--- a/src/northbridge/transmeta/tm5800/Config.lb
+++ b/src/northbridge/transmeta/tm5800/Config.lb
@@ -1,5 +1,4 @@
 
 config chip.h
 object northbridge.o
-driver misc_control.o
 
diff --git a/src/northbridge/transmeta/tm5800/debug.c b/src/northbridge/transmeta/tm5800/debug.c
index 40296ee3c8..2c052741f6 100644
--- a/src/northbridge/transmeta/tm5800/debug.c
+++ b/src/northbridge/transmeta/tm5800/debug.c
@@ -68,94 +68,3 @@ static void dump_pci_devices(void)
 		dump_pci_device(dev);
 	}
 }
-
-static void dump_spd_registers(const struct mem_controller *ctrl)
-{
-	int i;
-	print_debug("\r\n");
-	for(i = 0; i < 4; i++) {
-		unsigned device;
-		device = ctrl->channel0[i];
-		if (device) {
-			int j;
-			print_debug("dimm: "); 
-			print_debug_hex8(i); 
-			print_debug(".0: ");
-			print_debug_hex8(device);
-			for(j = 0; j < 256; j++) {
-				int status;
-				unsigned char byte;
-				if ((j & 0xf) == 0) {
-					print_debug("\r\n");
-					print_debug_hex8(j);
-					print_debug(": ");
-				}
-				status = smbus_read_byte(device, j);
-				if (status < 0) {
-					print_debug("bad device\r\n");
-					break;
-				}
-				byte = status & 0xff;
-				print_debug_hex8(byte);
-				print_debug_char(' ');
-			}
-			print_debug("\r\n");
-		}
-		device = ctrl->channel1[i];
-		if (device) {
-			int j;
-			print_debug("dimm: "); 
-			print_debug_hex8(i); 
-			print_debug(".1: ");
-			print_debug_hex8(device);
-			for(j = 0; j < 256; j++) {
-				int status;
-				unsigned char byte;
-				if ((j & 0xf) == 0) {
-					print_debug("\r\n");
-					print_debug_hex8(j);
-					print_debug(": ");
-				}
-				status = smbus_read_byte(device, j);
-				if (status < 0) {
-					print_debug("bad device\r\n");
-					break;
-				}
-				byte = status & 0xff;
-				print_debug_hex8(byte);
-				print_debug_char(' ');
-			}
-			print_debug("\r\n");
-		}
-	}
-}
-static void dump_smbus_registers(void)
-{
-        int i;
-        print_debug("\r\n");
-        for(i = 1; i < 0x80; i++) {
-                unsigned device;
-                device = i;
-                int j;
-                print_debug("smbus: ");
-                print_debug_hex8(device);
-                for(j = 0; j < 256; j++) {
-                	int status; 
-                        unsigned char byte;
-                        if ((j & 0xf) == 0) {
-                	        print_debug("\r\n");
-                                print_debug_hex8(j);
-                                print_debug(": ");
-                        }
-                        status = smbus_read_byte(device, j);
-                        if (status < 0) {
-                                print_debug("bad device\r\n");
-                                break;
-                        }
-                        byte = status & 0xff;
-                        print_debug_hex8(byte);
-                        print_debug_char(' ');
-                }
-                print_debug("\r\n");
-	}	
-}
diff --git a/src/northbridge/transmeta/tm5800/northbridge.h b/src/northbridge/transmeta/tm5800/northbridge.h
index 6d3b60f25b..07ac989736 100644
--- a/src/northbridge/transmeta/tm5800/northbridge.h
+++ b/src/northbridge/transmeta/tm5800/northbridge.h
@@ -1,5 +1,5 @@
-#ifndef NORTHBRIDGE_AMD_AMDK8_H
-#define NORTHBRIDGE_AMD_AMDK8_H
+#ifndef NORTHBRIDGE_TRANSMETA_TM58000_H
+#define NORTHBRIDGE_TRANSMETA_TM58000_H
 
 
-#endif /* NORTHBRIDGE_AMD_AMDK8_H */
+#endif /* NORTHBRIDGE_TRANSMETA_TM58000_H */