From: kgene.kim@samsung•com (Kukjin Kim)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] Samsung Cleanup S3C24XX for v3.4
Date: Sat, 10 Mar 2012 08:16:46 -0800 [thread overview]
Message-ID: <4F5B7E6E.2010909@samsung.com> (raw)
In-Reply-To: <CAOesGMhbmnWSrfEQC5tVrskhjQPMSj1aki1CQ-UM_=mv0-re+A@mail.gmail.com>
On 03/08/12 08:56, Olof Johansson wrote:
> On Thu, Mar 8, 2012 at 3:08 AM, Kukjin Kim<kgene.kim@samsung•com> 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 <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
prev parent reply other threads:[~2012-03-10 16:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 11:08 [GIT PULL] Samsung Cleanup S3C24XX for v3.4 Kukjin Kim
2012-03-08 16:56 ` Olof Johansson
2012-03-10 16:16 ` Kukjin Kim [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F5B7E6E.2010909@samsung.com \
--to=kgene.kim@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox