From 0403c863e16a028bc4c55b0f6b7310f83d77e24c Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Wed, 30 Apr 2014 17:17:03 +1000
Subject: superio/*: Deal with some chip.h special cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While backing out the empty pc80 keyboard struct we encountered some
special cases where chip.h is used for other purposes. Deal with these
cases.

Change-Id: Ib11a46cfd14d050d5daa213623b9d8a401c06410
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5621
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/superio/nsc/pc97307/chip.h    | 37 -------------------------------------
 src/superio/nsc/pc97307/superio.c |  1 -
 src/superio/nsc/pc97317/chip.h    | 38 --------------------------------------
 src/superio/nsc/pc97317/superio.c |  1 -
 4 files changed, 77 deletions(-)
 delete mode 100644 src/superio/nsc/pc97307/chip.h
 delete mode 100644 src/superio/nsc/pc97317/chip.h

(limited to 'src/superio/nsc')

diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
deleted file mode 100644
index e0c133009d..0000000000
--- a/src/superio/nsc/pc97307/chip.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- *
- * 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
- */
-
-#ifndef SUPERIO_NSC_PC97307_CHIP_H
-#define SUPERIO_NSC_PC97307_CHIP_H
-
-#ifndef PNP_INDEX_REG
-#define PNP_INDEX_REG   0x15C
-#endif
-#ifndef PNP_DATA_REG
-#define PNP_DATA_REG    0x15D
-#endif
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc97307_config {
-
-	struct pc_keyboard keyboard;
-};
-#endif
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index af7ca777bf..6b15901803 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h" /* FIXME */
 #include "pc97307.h"
 
 static void init(device_t dev)
diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
deleted file mode 100644
index d8969165f6..0000000000
--- a/src/superio/nsc/pc97317/chip.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- *
- * 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
- */
-
-#ifndef SUPERIO_NSC_PC97317_CHIP_H
-#define SUPERIO_NSC_PC97317_CHIP_H
-
-#ifndef PNP_INDEX_REG
-#define PNP_INDEX_REG   0x15C
-#endif
-#ifndef PNP_DATA_REG
-#define PNP_DATA_REG    0x15D
-#endif
-
-#include <pc80/keyboard.h>
-
-struct superio_nsc_pc97317_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 6f39c5da8c..09c3b5eeba 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h" /* FIXME */
 #include "pc97317.h"
 
 static void init(device_t dev)
-- 
cgit v1.2.3