From: Andrew Morton Signed-off-by: Andrew Morton --- arch/powerpc/configs/ebony_defconfig | 18 ------------------ 1 files changed, 18 deletions(-) diff -puN arch/powerpc/configs/ebony_defconfig~git-powerpc-fixup arch/powerpc/configs/ebony_defconfig --- a/arch/powerpc/configs/ebony_defconfig~git-powerpc-fixup +++ a/arch/powerpc/configs/ebony_defconfig @@ -1,12 +1,7 @@ # # Automatically generated make config: don't edit -<<<<<<< HEAD/arch/powerpc/configs/ebony_defconfig -# Linux kernel version: 2.6.23-rc4 -# Thu Aug 30 16:34:11 2007 -======= # Linux kernel version: 2.6.23-rc1-powerpc-ebony-mtd # Mon Jul 30 15:47:59 2007 ->>>>>>> /arch/powerpc/configs/ebony_defconfig # # CONFIG_PPC64 is not set @@ -318,10 +313,6 @@ CONFIG_FW_LOADER=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y -<<<<<<< HEAD/arch/powerpc/configs/ebony_defconfig -# CONFIG_MTD is not set -CONFIG_OF_DEVICE=y -======= CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -397,7 +388,6 @@ CONFIG_MTD_PHYSMAP_OF=y # # CONFIG_MTD_UBI is not set CONFIG_OF_DEVICE=y ->>>>>>> /arch/powerpc/configs/ebony_defconfig # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set @@ -609,15 +599,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y # CONFIG_MMC is not set # CONFIG_NEW_LEDS is not set # CONFIG_INFINIBAND is not set -<<<<<<< HEAD/arch/powerpc/configs/ebony_defconfig -# CONFIG_EDAC is not set -======= # CONFIG_EDAC is not set # # Real Time Clock # ->>>>>>> /arch/powerpc/configs/ebony_defconfig # CONFIG_RTC_CLASS is not set # @@ -855,8 +841,4 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set -<<<<<<< HEAD/arch/powerpc/configs/ebony_defconfig -# CONFIG_CRYPTO_HW is not set -======= CONFIG_CRYPTO_HW=y ->>>>>>> /arch/powerpc/configs/ebony_defconfig _