diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/s390/defconfig | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/s390/defconfig')
| -rw-r--r-- | arch/s390/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 07fd0414a4bf..89850b2c27ea 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
| @@ -245,6 +245,7 @@ CONFIG_S390_TAPE_BLOCK=y | |||
| 245 | # | 245 | # |
| 246 | CONFIG_S390_TAPE_34XX=m | 246 | CONFIG_S390_TAPE_34XX=m |
| 247 | # CONFIG_VMLOGRDR is not set | 247 | # CONFIG_VMLOGRDR is not set |
| 248 | # CONFIG_VMCP is not set | ||
| 248 | # CONFIG_MONREADER is not set | 249 | # CONFIG_MONREADER is not set |
| 249 | # CONFIG_DCSS_SHM is not set | 250 | # CONFIG_DCSS_SHM is not set |
| 250 | 251 | ||