diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/arm | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/def-configs/brutus | 1 | ||||
| -rw-r--r-- | arch/arm/def-configs/ebsa110 | 1 | ||||
| -rw-r--r-- | arch/arm/def-configs/footbridge | 1 | ||||
| -rw-r--r-- | arch/arm/def-configs/thinclient | 1 | ||||
| -rw-r--r-- | arch/arm/defconfig | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/def-configs/brutus b/arch/arm/def-configs/brutus index 284c92925..a72f0f312 100644 --- a/arch/arm/def-configs/brutus +++ b/arch/arm/def-configs/brutus @@ -216,6 +216,7 @@ CONFIG_FONT_8x8=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set diff --git a/arch/arm/def-configs/ebsa110 b/arch/arm/def-configs/ebsa110 index 09fff229c..417ad00ff 100644 --- a/arch/arm/def-configs/ebsa110 +++ b/arch/arm/def-configs/ebsa110 @@ -361,6 +361,7 @@ CONFIG_MINIX_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set # CONFIG_DEVPTS_FS is not set # CONFIG_QNX4FS_FS is not set diff --git a/arch/arm/def-configs/footbridge b/arch/arm/def-configs/footbridge index e0ee910b7..acfd9de17 100644 --- a/arch/arm/def-configs/footbridge +++ b/arch/arm/def-configs/footbridge @@ -690,6 +690,7 @@ CONFIG_JOLIET=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set diff --git a/arch/arm/def-configs/thinclient b/arch/arm/def-configs/thinclient index 01829e71f..b512fad1d 100644 --- a/arch/arm/def-configs/thinclient +++ b/arch/arm/def-configs/thinclient @@ -340,6 +340,7 @@ CONFIG_SMC9194=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 077eef8b3..af422cd83 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -639,6 +639,7 @@ CONFIG_JOLIET=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set |