Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi...

[deliverable/linux.git] / include / linux / arm-cci.h

diff --git a/include/linux/arm-cci.h b/include/linux/arm-cci.h
index aede5c765eec2b71bcc396b0583189a7cbd6eff5..521ec1f2e6bc08441279c0ca5245d82394885ddf 100644 (file)
--- a/include/linux/arm-cci.h
+++ b/include/linux/arm-cci.h
@@ -30,12 +30,16 @@ struct device_node;
 
 #ifdef CONFIG_ARM_CCI
 extern bool cci_probed(void);
+#else
+static inline bool cci_probed(void) { return false; }
+#endif
+
+#ifdef CONFIG_ARM_CCI400_PORT_CTRL
 extern int cci_ace_get_port(struct device_node *dn);
 extern int cci_disable_port_by_cpu(u64 mpidr);
 extern int __cci_control_port_by_device(struct device_node *dn, bool enable);
 extern int __cci_control_port_by_index(u32 port, bool enable);
 #else
-static inline bool cci_probed(void) { return false; }
 static inline int cci_ace_get_port(struct device_node *dn)
 {
        return -ENODEV;
@@ -51,6 +55,7 @@ static inline int __cci_control_port_by_index(u32 port, bool enable)
        return -ENODEV;
 }
 #endif
+
 #define cci_disable_port_by_device(dev) \
        __cci_control_port_by_device(dev, false)
 #define cci_enable_port_by_device(dev) \