diff --git a/[refs] b/[refs] index da7886d98c19..4869fc3b26d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e404cd65860d6da7c08362e9e4d0b5dc40a9985 +refs/heads/master: 65b3841b9cb5fe1b239f12dbf033f9827d73d032 diff --git a/trunk/include/linux/of_net.h b/trunk/include/linux/of_net.h index f47464188710..61bf53b02779 100644 --- a/trunk/include/linux/of_net.h +++ b/trunk/include/linux/of_net.h @@ -11,6 +11,16 @@ #include extern const int of_get_phy_mode(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np); +#else +static inline const int of_get_phy_mode(struct device_node *np) +{ + return -ENODEV; +} + +static inline const void *of_get_mac_address(struct device_node *np) +{ + return NULL; +} #endif #endif /* __LINUX_OF_NET_H */