diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-25 22:41:00 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-25 22:41:00 -0500 |
| commit | 874f2f997dbe041a6c6e509dae8656ed9022d65d (patch) | |
| tree | 61898165882041ef7f9beaf2ef6663a1a4d3c29a /drivers/of/Kconfig | |
| parent | 071c06cb570d38efe23a124e885f2f3e643a9206 (diff) | |
| parent | 6ebdc661b608671e9ca572af8bb42d58108cc008 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
Diffstat (limited to 'drivers/of/Kconfig')
| -rw-r--r-- | drivers/of/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index d2fa27c5c1b2..7cecc8fea9bd 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | config OF_FLATTREE | ||
| 2 | bool | ||
| 3 | depends on OF | ||
| 4 | |||
| 5 | config OF_DYNAMIC | ||
| 6 | def_bool y | ||
| 7 | depends on OF && PPC_OF | ||
| 8 | |||
| 1 | config OF_DEVICE | 9 | config OF_DEVICE |
| 2 | def_bool y | 10 | def_bool y |
| 3 | depends on OF && (SPARC || PPC_OF || MICROBLAZE) | 11 | depends on OF && (SPARC || PPC_OF || MICROBLAZE) |