src/*: Remove the last remnants of struct keyboard

Change-Id: I7d0e8d2119a470428cfc01c0738b8988ab75ba2d
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5624
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

8 files changed, 5 insertions, 9 deletions

diff --git a/src/ec/compal/ene932/chip.h b/src/ec/compal/ene932/chip.h
index 5d209ffa05..7dcd3ebdd8 100644
--- a/src/ec/compal/ene932/chip.h
+++ b/src/ec/compal/ene932/chip.h
@@ -23,13 +23,11 @@
 #define _EC_COMPAL_ENE932_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_compal_ene932_ops;
 
 struct ec_compal_ene932_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_COMPAL_ENE932_CHIP_H */
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index e60a0ac9e0..2e83b4ccc4 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <arch/io.h>
 #include <delay.h>
+#include <pc80/keyboard.h>
 #include "ec.h"
 #include "chip.h"
 
diff --git a/src/ec/google/chromeec/chip.h b/src/ec/google/chromeec/chip.h
index eb356328fc..1cd97f478b 100644
--- a/src/ec/google/chromeec/chip.h
+++ b/src/ec/google/chromeec/chip.h
@@ -21,12 +21,10 @@
 #define EC_GOOGLE_CHROMEEC_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 extern struct chip_operations ec_google_chromeec_ops;
 
 struct ec_google_chromeec_config {
-	struct pc_keyboard keyboard;
 };
 
-#endif
+#endif /* EC_GOOGLE_CHROMEEC_CHIP_H */
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 5f377c923e..8b1cb2ff62 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -24,6 +24,7 @@
 #include <arch/io.h>
 #include <delay.h>
 #include <device/pnp.h>
+#include <pc80/keyboard.h>
 #include "chip.h"
 #include "ec.h"
 #include "ec_commands.h"
diff --git a/src/ec/quanta/ene_kb3940q/chip.h b/src/ec/quanta/ene_kb3940q/chip.h
index ce95c1c27e..6a28c43a94 100644
--- a/src/ec/quanta/ene_kb3940q/chip.h
+++ b/src/ec/quanta/ene_kb3940q/chip.h
@@ -23,13 +23,11 @@
 #define _EC_QUANTA_ENE_KB3940Q_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_quanta_ene_kb3940q_ops;
 
 struct ec_quanta_ene_kb3940q_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_QUANTA_ENE_KB3940Q_CHIP_H */
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 57854d051f..7d0e6ae309 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <delay.h>
 #include <elog.h>
+#include <pc80/keyboard.h>
 #include "ec.h"
 #include "chip.h"
 
diff --git a/src/ec/quanta/it8518/chip.h b/src/ec/quanta/it8518/chip.h
index cc7d3745a9..52e842b87d 100644
--- a/src/ec/quanta/it8518/chip.h
+++ b/src/ec/quanta/it8518/chip.h
@@ -23,13 +23,11 @@
 #define _EC_QUANTA_IT8518_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_quanta_it8518_ops;
 
 struct ec_quanta_it8518_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_QUANTA_IT8518_CHIP_H */
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 7588a1ea4a..9e6d3d0847 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -22,6 +22,7 @@
 
 
 #include <console/console.h>
+#include <pc80/keyboard.h>
 
 #ifndef __PRE_RAM__
 #include <device/device.h>