diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 11:06:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 11:06:49 -0400 |
| commit | 6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a (patch) | |
| tree | f2f77cc31b4548745778fca6a51b09e1d8a49804 /include/linux/of_platform.h | |
| parent | b50f315cbb865079a16a12fd9ae6083f98fd592c (diff) | |
| parent | c1d10d18c542278b7fbc413c289d3cb6219da6b3 (diff) | |
Merge branch 'master' into upstream.
This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
Diffstat (limited to 'include/linux/of_platform.h')
| -rw-r--r-- | include/linux/of_platform.h | 3 |
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, | |||
| 52 | const char *bus_id, | 52 | const char *bus_id, |
| 53 | struct device *parent); | 53 | struct device *parent); |
| 54 | 54 | ||
| 55 | /* pseudo "matches" value to not do deep probe */ | ||
| 56 | #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1) | ||
| 57 | |||
| 58 | extern int of_platform_bus_probe(struct device_node *root, | 55 | extern int of_platform_bus_probe(struct device_node *root, |
| 59 | const struct of_device_id *matches, | 56 | const struct of_device_id *matches, |
| 60 | struct device *parent); | 57 | struct device *parent); |