diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 10:00:34 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 10:00:34 -0400 |
| commit | 7946ada30bc45546cefc85809ba0fd07879eff52 (patch) | |
| tree | 03c382e8e4f9b81f151be953de3b7f61411c9303 /arch/sparc | |
| parent | 98b270362bb9ea6629732e7f5b65b8a6ce4743c7 (diff) | |
| parent | 3d80636a0d5f056ffc26472d05b6027a7a9f6e1c (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/Kconfig | 4 | ||||
| -rw-r--r-- | arch/sparc/defconfig | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index f7c51b869049..6537445dac0e 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -21,10 +21,6 @@ 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 | |||
| 28 | source "init/Kconfig" | 24 | source "init/Kconfig" |
| 29 | 25 | ||
| 30 | menu "General machine setup" | 26 | menu "General machine setup" |
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index 8a3aef1e22f5..a69856263009 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig | |||
| @@ -5,7 +5,6 @@ CONFIG_MMU=y | |||
| 5 | CONFIG_UID16=y | 5 | CONFIG_UID16=y |
| 6 | CONFIG_HIGHMEM=y | 6 | CONFIG_HIGHMEM=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_GENERIC_IOMAP=y | ||
| 9 | 8 | ||
| 10 | # | 9 | # |
| 11 | # Code maturity level options | 10 | # Code maturity level options |