diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/m68knommu/defconfig | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.gz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/m68knommu/defconfig')
| -rw-r--r-- | arch/m68knommu/defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68knommu/defconfig b/arch/m68knommu/defconfig index 87f2d6587c5..2d59ba1a79b 100644 --- a/arch/m68knommu/defconfig +++ b/arch/m68knommu/defconfig @@ -99,7 +99,7 @@ CONFIG_M5272C3=y # CONFIG_NETtel is not set # CONFIG_CPU16B is not set # CONFIG_MOD5272 is not set -CONFIG_MOTOROLA=y +CONFIG_FREESCALE=y # CONFIG_LARGE_ALLOCS is not set CONFIG_4KSTACKS=y CONFIG_RAMAUTO=y @@ -554,7 +554,6 @@ CONFIG_EXT2_FS=y # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=y -CONFIG_MAGIC_ROM_PTR=y # CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_DNOTIFY is not set |