Subject: [GIT PULL] Samsung Cleanup S3C24XX for v3.4

From: [email-masked] (Kukjin Kim)
Date: Sat, 10 Mar 2012 08:16:46 -0800

On 03/08/12 08:56, Olof Johansson wrote:
> On Thu, Mar 8, 2012 at 3:08 AM, Kukjin Kim<[email-masked]>  wrote:
>> Hi Arnd, Olof,
>>
>> Please pull cleanup s3c24xx from following:
>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>> next/cleanup-s3c24xx
>>
>> As I said before, this is including merge of mach-s3c24.. directories into
>> just one mach-s3c24xx directory.
>>
>> If any problems, please kindly let me know.
>
> Thanks, pulled. Nice first step on making all of this common!
>
Thanks and as a note, will happen conflicts when this is on top of 
latest mainline.

Just FYI.

arch/arm/mach-s3c2440/common.h can be deleted with following

diff --cc arch/arm/mach-s3c24xx/common.h
index f65dc80,62a2e19..a7cd62f
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@@ -12,6 -12,12 +12,12 @@@
   #ifndef __ARCH_ARM_MACH_S3C2410_COMMON_H
   #define __ARCH_ARM_MACH_S3C2410_COMMON_H

+ #ifdef CONFIG_CPU_S3C2410
   void s3c2410_restart(char mode, const char *cmd);
+ #endif
+
  -#ifdef CONFIG_CPU_S3C2440
  -void s3c2440_restart(char mode, const char *cmd);
++#ifdef CONFIG_CPU_S3C244X
++void s3c244x_restart(char mode, const char *cmd);
+ #endif

   #endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.