diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /arch/sparc/Kconfig | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 6537445dac0e..f7c51b869049 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -21,6 +21,10 @@ config GENERIC_ISA_DMA | |||
| 21 | bool | 21 | bool |
| 22 | default y | 22 | default y |
| 23 | 23 | ||
| 24 | config GENERIC_IOMAP | ||
| 25 | bool | ||
| 26 | default y | ||
| 27 | |||
| 24 | source "init/Kconfig" | 28 | source "init/Kconfig" |
| 25 | 29 | ||
| 26 | menu "General machine setup" | 30 | menu "General machine setup" |