diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /arch/um/Kconfig.rest | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/Kconfig.rest')
| -rw-r--r-- | arch/um/Kconfig.rest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Kconfig.rest b/arch/um/Kconfig.rest index 7b5cea75a6c4..0ccad0ff6d6e 100644 --- a/arch/um/Kconfig.rest +++ b/arch/um/Kconfig.rest | |||
| @@ -36,7 +36,7 @@ source "drivers/leds/Kconfig" | |||
| 36 | 36 | ||
| 37 | #This is just to shut up some Kconfig warnings, so no prompt. | 37 | #This is just to shut up some Kconfig warnings, so no prompt. |
| 38 | config INPUT | 38 | config INPUT |
| 39 | bool | 39 | tristate |
| 40 | default n | 40 | default n |
| 41 | 41 | ||
| 42 | source "arch/um/Kconfig.debug" | 42 | source "arch/um/Kconfig.debug" |