diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /init/Kconfig | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 43d6989c275f..250e02c8f8f9 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -802,6 +802,10 @@ config PROC_PAGE_MONITOR | |||
| 802 | 802 | ||
| 803 | endmenu # General setup | 803 | endmenu # General setup |
| 804 | 804 | ||
| 805 | config HAVE_GENERIC_DMA_COHERENT | ||
| 806 | bool | ||
| 807 | default n | ||
| 808 | |||
| 805 | config SLABINFO | 809 | config SLABINFO |
| 806 | bool | 810 | bool |
| 807 | depends on PROC_FS | 811 | depends on PROC_FS |