diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/sh | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/config.in | 2 | ||||
| -rw-r--r-- | arch/sh/defconfig | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/config.in b/arch/sh/config.in index 8b74eeafa..fd858e00e 100644 --- a/arch/sh/config.in +++ b/arch/sh/config.in @@ -155,7 +155,7 @@ if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then source drivers/char/pcmcia/Config.in fi -source drivers/misc/Config.in +#source drivers/misc/Config.in source fs/Config.in diff --git a/arch/sh/defconfig b/arch/sh/defconfig index 5fabcdedc..ea5851d39 100644 --- a/arch/sh/defconfig +++ b/arch/sh/defconfig @@ -96,10 +96,6 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_UNIX98_PTYS is not set # -# Misc devices -# - -# # Filesystems # # CONFIG_QUOTA is not set |