summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 09:30:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 09:30:20 -0700
commite264ac8cad5a3f2e717ac68eb300766eef61f568 (patch)
treef6230e79ef751783d9a723c826dd64efde7d53c0 /include
parent200460067d19db4aab7f1d9f5c95dd644d260337 (diff)
parent06fb01fd1dc624d891cbe039a88a44bc8a8a9ec1 (diff)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: spi/pl022: Add loopback support for the SPI on 5500 spi/omap_mcspi: Fix broken last word xfer of/flattree: minor cleanups dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table dt: protect against NULL matches passed to of_match_node() dt: Refactor of_platform_bus_probe()
Diffstat (limited to 'include')
-rw-r--r--include/linux/of_platform.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 17c7e21c0bd7..fb51ae38cea7 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -52,9 +52,6 @@ extern struct platform_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
struct device *parent);
-/* pseudo "matches" value to not do deep probe */
-#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
-
extern int of_platform_bus_probe(struct device_node *root,
const struct of_device_id *matches,
struct device *parent);