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>

src/include/cpu/x86/smm.h

@@ -24,6 +24,9 @@
 #ifndef CPU_X86_SMM_H
 #define CPU_X86_SMM_H
 
+#include <arch/cpu.h>
+#include <types.h>
+
 #define SMM_DEFAULT_BASE 0x30000
 #define SMM_DEFAULT_SIZE 0x10000
 
@@ -33,8 +36,6 @@
 #define SMM_ENTRY_OFFSET 0x8000
 #define SMM_SAVE_STATE_BEGIN(x) (SMM_ENTRY_OFFSET + (x))
 
-#include <arch/cpu.h>
-#include <types.h>
 typedef struct {
 	u16	es_selector;
 	u16	es_attributes;
@@ -581,4 +582,4 @@ int smm_load_module(void *smram, int size, struct smm_loader_params *params);
 void *backup_default_smm_area(void);
 void restore_default_smm_area(void *smm_save_area);
 
-#endif
+#endif /* CPU_X86_SMM_H */