Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen :)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s3c64xx/Makefile between commit b024043b6d0d ("ARM: 7245/1:
> S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> and commits 8f8a8d269bb4 ("ARM: S3C64XX: Add basic cpuidle driver"),
> a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from platform
> data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI platform
> devices to plat-samsung") and 4566c7f7612f ("ARM: S3C64XX: Modified files
> for SPI consolidation work") from the s5p tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
>
Looks good to me.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/arm/mach-s3c64xx/Makefile
> index f37016c,2244c42..0000000
> --- a/arch/arm/mach-s3c64xx/Makefile
> +++ b/arch/arm/mach-s3c64xx/Makefile
> @@@ -19,29 -19,29 +19,29 @@@ obj-y += common.o
> clock.
> obj-$(CONFIG_CPU_S3C6400) += s3c6400.o
> obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
>
> -obj-y += irq.o
> -obj-y += irq-eint.o
> +# PM
> +
> +obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o
> ++obj-$(CONFIG_CPU_IDLE) += cpuidle.o
>
> # DMA support
>
> obj-$(CONFIG_S3C64XX_DMA) += dma.o
>
> -# Device setup
> +# Device support
>
> -obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
> -obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
> -obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
> -obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
> -obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
> -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
> -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
> +obj-y += dev-uart.o
> +obj-y += dev-audio.o
> - obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
>
> -# PM
> +# Device setup
>
> -obj-$(CONFIG_PM) += pm.o
> -obj-$(CONFIG_PM) += sleep.o
> -obj-$(CONFIG_PM) += irq-pm.o
> -obj-$(CONFIG_CPU_IDLE) += cpuidle.o
> +obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
> +obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
> +obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
> +obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
> +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
> - obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
> +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
> ++obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
>
> # Machine support
>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
