drivers/spi: Sanitize headers from preprocessor abuse
Continuing on from the rational given in:
a173a62 Remove guarding #includes by CONFIG_FOO combinations
Change-Id: I35c636ee7c0b106323b3e4b90629f7262750f8bd
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6114
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index f3a5906..626d506 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -7,14 +7,13 @@
* Licensed under the GPL-2 or later.
*/
+#include <cpu/x86/smm.h>
+#include <delay.h>
#include <stdlib.h>
#include <string.h>
#include <spi-generic.h>
#include <spi_flash.h>
-#include <delay.h>
-#ifdef __SMM__
-#include <cpu/x86/smm.h>
-#endif
+
#include "spi_flash_internal.h"
#include <timer.h>