From b57fef9f3e2b3cb8d8c8c5a3552c94a28ff81d15 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Tue, 17 Jun 2014 20:13:08 +1000
Subject: src/ec: Sanitize headers and comment #endif pairings

Comment #endif /* FOO */ pairings.
Alphabetise headers and remove any #if CONFIG_ guards around them.

Background rational:
Remove guarding the inclusion of headers based on CONFIG_ options. This
*potentially* could hide issues such as functions being swapped from
under our feet, since different runtime behaviour could be declared with
the same function same name and type-signature. Hence, depending on the
header we happen to get may change runtime behaviour.

Change-Id: Ic61bdfb64d99f0e2998c6451ae6686915b7bb3d4
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6059
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 src/ec/lenovo/pmh7/pmh7.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/ec/lenovo/pmh7/pmh7.c')

diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index a4d0ccc466..cb0e27b89b 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -19,16 +19,13 @@
 
 #include <arch/io.h>
 #include <console/console.h>
-#ifndef __PRE_RAM__
-#ifndef __SMM__
 #include <device/device.h>
 #include <device/pnp.h>
-#endif
-#endif
 #include <stdlib.h>
+#include <pc80/mc146818rtc.h>
+
 #include "pmh7.h"
 #include "chip.h"
-#include <pc80/mc146818rtc.h>
 
 void pmh7_backlight_enable(int onoff)
 {
-- 
cgit v1.2.3