Subject: Re: [PATCH 1/2] powerpc, mpc5200: update defconfig to fit with 2.6.37-rc4

From: Wolfram Sang <[email-masked]>
Date: Sun, 12 Dec 2010 09:47:07 +0100

On Sat, Dec 11, 2010 at 07:13:00AM +0100, Heiko Schocher wrote:
> Signed-off-by: Heiko Schocher <[email-masked]>

I'd say the two patches can be merged. Dunno what Grant prefers whom you should
CC as he is the maintainer.

> cc: Wolfram Sang <[email-masked]>
> cc: [email-masked]
> ---
> - based against 2.6.37-rc4
> - I did the following steps to generate this patch:
> 
>   make mpc5200_defconfig
>   make savedefconfig
>   cp ./defconfig arch/powerpc/configs/mpc5200_defconfig
> 
>  arch/powerpc/configs/mpc5200_defconfig |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
> index 7376e27..6f75623 100644
> --- a/arch/powerpc/configs/mpc5200_defconfig
> +++ b/arch/powerpc/configs/mpc5200_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
> +CONFIG_SPARSE_IRQ=y
>  CONFIG_LOG_BUF_SHIFT=14
>  CONFIG_BLK_DEV_INITRD=y
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
> @@ -20,7 +21,6 @@ CONFIG_PPC_BESTCOMM=y
>  CONFIG_SIMPLE_GPIO=y
>  CONFIG_NO_HZ=y
>  CONFIG_HIGH_RES_TIMERS=y
> -CONFIG_SPARSE_IRQ=y
>  CONFIG_PM=y
>  CONFIG_NET=y
>  CONFIG_PACKET=y
> @@ -52,7 +52,6 @@ CONFIG_PROC_DEVICETREE=y
>  CONFIG_BLK_DEV_LOOP=y
>  CONFIG_BLK_DEV_RAM=y
>  CONFIG_BLK_DEV_RAM_SIZE=32768
> -CONFIG_EEPROM_AT24=y

NACK.

>  CONFIG_SCSI_TGT=y
>  CONFIG_BLK_DEV_SD=y
>  CONFIG_CHR_DEV_SG=y
> @@ -114,7 +113,6 @@ CONFIG_RTC_DRV_DS1307=y
>  CONFIG_EXT2_FS=y
>  CONFIG_EXT3_FS=y
>  # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
> -CONFIG_INOTIFY=y

Are you sure?

>  CONFIG_MSDOS_FS=y
>  CONFIG_VFAT_FS=y
>  CONFIG_PROC_KCORE=y
> @@ -132,5 +130,4 @@ CONFIG_PRINTK_TIME=y
>  CONFIG_DEBUG_KERNEL=y
>  CONFIG_DETECT_HUNG_TASK=y
>  CONFIG_DEBUG_INFO=y
> -# CONFIG_RCU_CPU_STALL_DETECTOR is not set
>  # CONFIG_CRYPTO_ANSI_CPRNG is not set
> -- 
> 1.7.2.3
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |