summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/mpc8xxx_spi.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-07-15 20:48:46 (GMT)
committerWolfgang Denk <wd@denx.de>2010-07-15 20:48:46 (GMT)
commit93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658 (patch)
tree85bf8677d8e8095ef18453199a99c5e4131d217d /arch/powerpc/include/asm/mpc8xxx_spi.h
parentdce6538f5d21a0def8a4df5328d536abed3e136a (diff)
parentd6f324d03d7829a1da1dee8b60f91b173a3976f0 (diff)
downloadu-boot-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.tar.xz
Merge branch 'master' of ../master
Diffstat (limited to 'arch/powerpc/include/asm/mpc8xxx_spi.h')
-rw-r--r--arch/powerpc/include/asm/mpc8xxx_spi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h
index 41737d3..b0082af 100644
--- a/arch/powerpc/include/asm/mpc8xxx_spi.h
+++ b/arch/powerpc/include/asm/mpc8xxx_spi.h
@@ -27,9 +27,10 @@
#include <asm/types.h>
-#if defined(CONFIG_MPC834x) || \
+#if defined(CONFIG_MPC8308) || \
defined(CONFIG_MPC8313) || \
defined(CONFIG_MPC8315) || \
+ defined(CONFIG_MPC834x) || \
defined(CONFIG_MPC837x)
typedef struct spi8xxx {