diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
| commit | 34b8c399dc04c8e51f014b73458e654570698597 (patch) | |
| tree | 7027eda7a780e9d945ef271f8c2ea5aaede5dd25 /arch/um/Kconfig | |
| parent | eaceec7f6cc5223d0f146086884d67746b8aa81d (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 563301fe5df8..1eb21de9d1b5 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
| @@ -289,6 +289,8 @@ source "arch/um/Kconfig.net" | |||
| 289 | 289 | ||
| 290 | source "drivers/net/Kconfig" | 290 | source "drivers/net/Kconfig" |
| 291 | 291 | ||
| 292 | source "drivers/connector/Kconfig" | ||
| 293 | |||
| 292 | source "fs/Kconfig" | 294 | source "fs/Kconfig" |
| 293 | 295 | ||
| 294 | source "security/Kconfig" | 296 | source "security/Kconfig" |