Merge branch 'for-next/misc'

2 files changed, 27 insertions, 0 deletions

diff --git a/include/net/ep93xx_eth.h b/include/net/ep93xx_eth.h
new file mode 100644
index 0000000000..0fb11d0acd
--- /dev/null
+++ b/include/net/ep93xx_eth.h
@@ -0,0 +1,26 @@
+/*
+ * (C) Copyright 2016 Alexander Kurz <akurz@blala.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __NET_EP93XX_ETH_H
+#define __NET_EP93XX_ETH_H
+
+#include <linux/phy.h>
+
+struct ep93xx_eth_platform_data {
+	phy_interface_t	xcv_type;
+	int		phy_addr;
+};
+
+#endif /* __NET_EP93XX_ETH_H */
diff --git a/include/of.h b/include/of.h
index 75cc3c11c1..8c8f57a7cc 100644
--- a/include/of.h
+++ b/include/of.h
@@ -249,6 +249,7 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath,
 int of_find_path_by_node(struct device_node *node, char **outpath, unsigned flags);
 int of_register_fixup(int (*fixup)(struct device_node *, void *), void *context);
 int of_unregister_fixup(int (*fixup)(struct device_node *, void *), void *context);
+int of_register_set_status_fixup(const char *node, bool status);
 struct device_node *of_find_node_by_alias(struct device_node *root,
 		const char *alias);
 struct device_node *of_find_node_by_path_or_alias(struct device_node *root,