6 files changed, 26 insertions, 15 deletions
diff --git a/src/southbridge/intel/i82801dbm/Config.lb b/src/southbridge/intel/i82801dbm/Config.lb
index 75fccaa8e1..bdbbe4f515 100644
--- a/src/southbridge/intel/i82801dbm/Config.lb
+++ b/src/southbridge/intel/i82801dbm/Config.lb
@@ -1,4 +1,4 @@
-config i82801dbm.h
+config chip.h
 driver i82801dbm.o
 driver i82801dbm_usb.o
 driver i82801dbm_lpc.o
diff --git a/src/southbridge/intel/i82801dbm/chip.h b/src/southbridge/intel/i82801dbm/chip.h
new file mode 100644
index 0000000000..e1e3da0e6f
--- /dev/null
+++ b/src/southbridge/intel/i82801dbm/chip.h
@@ -0,0 +1,12 @@
+#ifndef I82801DBM_CHIP_H
+#define I82801DBM_CHIP_H
+
+struct southbridge_intel_i82801dbm_config 
+{
+	int enable_usb;
+	int enable_native_ide;
+};
+struct chip_operations;
+extern struct chip_operations southbridge_intel_i82801dbm_ops;
+
+#endif /* I82801DBM_CHIP_H */
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.h b/src/southbridge/intel/i82801dbm/i82801dbm.h
index 5b65e1489b..824d23a0b6 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm.h
+++ b/src/southbridge/intel/i82801dbm/i82801dbm.h
@@ -9,14 +9,7 @@
 #ifndef I82801DBM_H
 #define I82801DBM_H
 
-struct southbridge_intel_i82801dbm_config 
-{
-  int enable_usb;
-  int enable_native_ide;
-};
-struct chip_control;
-extern struct chip_control southbridge_intel_i82801dbm_control;
-
+#include "chip.h"
 extern void i82801dbm_enable(device_t dev);
 
 /*
diff --git a/src/southbridge/intel/i82801er/Config.lb b/src/southbridge/intel/i82801er/Config.lb
index cc77c755a7..b2d7d65baa 100644
--- a/src/southbridge/intel/i82801er/Config.lb
+++ b/src/southbridge/intel/i82801er/Config.lb
@@ -1,4 +1,4 @@
-config i82801er.h
+config chip.h
 driver i82801er.o
 driver i82801er_usb.o
 driver i82801er_lpc.o
diff --git a/src/southbridge/intel/i82801er/chip.h b/src/southbridge/intel/i82801er/chip.h
new file mode 100644
index 0000000000..c7cfa14232
--- /dev/null
+++ b/src/southbridge/intel/i82801er/chip.h
@@ -0,0 +1,10 @@
+#ifndef I82801ER_CHIP_H
+#define I82801ER_CHIP_H
+
+struct southbridge_intel_i82801er_config 
+{
+};
+struct chip_operations;
+extern struct chip_operations southbridge_intel_i82801er_ops;
+
+#endif /* I82801ER_CHIP_H */
diff --git a/src/southbridge/intel/i82801er/i82801er.h b/src/southbridge/intel/i82801er/i82801er.h
index 85dce4ecb7..56ba634cc5 100644
--- a/src/southbridge/intel/i82801er/i82801er.h
+++ b/src/southbridge/intel/i82801er/i82801er.h
@@ -1,11 +1,7 @@
 #ifndef I82801ER_H
 #define I82801ER_H
 
-struct southbridge_intel_i82801er_config 
-{
-};
-struct chip_control;
-extern struct chip_control southbridge_intel_i82801er_control;
+#include "chip.h"
 
 extern void i82801er_enable(device_t dev);