Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / powerpc / include / asm / global_data.h

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index c57d9c0fafbf1da2fe101525512fea78e29cae26..3943d0e92b9e4f01829796c107bfd2abb7290042 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -15,6 +15,9 @@
 struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC)
        u32 sdhc_clk;
+#if defined(CONFIG_FSL_ESDHC_ADAPTER_IDENT)
+       u8 sdhc_adapter;
+#endif
 #endif
 #if defined(CONFIG_8xx)
        unsigned long brg_clk;
@@ -93,7 +96,7 @@ struct arch_global_data {
        unsigned long arbiter_event_attributes;
        unsigned long arbiter_event_address;
 #endif
-#if defined(CONFIG_SYS_ALLOC_DPRAM) || defined(CONFIG_CPM2)
+#if defined(CONFIG_CPM2)
        unsigned int dp_alloc_base;
        unsigned int dp_alloc_top;
 #endif