diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
| commit | 7a0287df3e83a0012dfc496d4a8af9c1c5b126ef (patch) | |
| tree | 27cc2f768de7e9014ffa899117bf219d0f20fb5e /arch/um/Kconfig.um | |
| parent | 6738d3210aabe3016a1b03cd98a7fc479c229197 (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/um/Kconfig.um')
| -rw-r--r-- | arch/um/Kconfig.um | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index 90a438acbfaf..b5e675e370c6 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um | |||
| @@ -47,7 +47,7 @@ config HOSTFS | |||
| 47 | 47 | ||
| 48 | config HPPFS | 48 | config HPPFS |
| 49 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" | 49 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" |
| 50 | depends on EXPERIMENTAL | 50 | depends on EXPERIMENTAL && PROC_FS |
| 51 | help | 51 | help |
| 52 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc | 52 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc |
| 53 | entries to be overridden, removed, or fabricated from the host. | 53 | entries to be overridden, removed, or fabricated from the host. |