diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:45 -0400 |
commit | d939d2851fd12568e2eabb2916769e8a57ba5c89 (patch) | |
tree | f3158a5ddd41541a61126f9e48de1ce89c632f64 /arch/um/Kconfig | |
parent | 9f5314fb4d556d3132c784d0df47352b2830ca53 (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into x86/irq
Diffstat (limited to 'arch/um/Kconfig')
-rw-r--r-- | arch/um/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index dba8e05f0287..6976812cfb18 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -259,6 +259,8 @@ if BROKEN | |||
259 | source "drivers/mtd/Kconfig" | 259 | source "drivers/mtd/Kconfig" |
260 | endif | 260 | endif |
261 | 261 | ||
262 | source "drivers/leds/Kconfig" | ||
263 | |||
262 | #This is just to shut up some Kconfig warnings, so no prompt. | 264 | #This is just to shut up some Kconfig warnings, so no prompt. |
263 | config INPUT | 265 | config INPUT |
264 | bool | 266 | bool |