Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 47734ffd97451698c1233c4cbae6f0c16317574c..5c39b9270ff7007b359df90a7cfc407607ddb7ab 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -16,8 +16,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/types.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/prom.h>
 
 /* flag descriptions */
@@ -54,7 +54,6 @@ extern int of_device_is_compatible(const struct device_node *device,
 extern const void *of_get_property(const struct device_node *node,
                                const char *name,
                                int *lenp);
-#define get_property(a, b, c)  of_get_property((a), (b), (c))
 extern int of_n_addr_cells(struct device_node *np);
 extern int of_n_size_cells(struct device_node *np);