diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-02-03 00:29:23 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 17:44:51 -0500 |
commit | b130d5c29544fe4cedafd35b112d27a06550d844 (patch) | |
tree | 3a12051f935c7a3ea819a4fee606b8a139523c9b /drivers/watchdog/Kconfig | |
parent | 507164d22357b26ac73411f42765054045ca0b76 (diff) |
ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX
This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung
S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443,
and S3C2450 SoCs so that we can merge the mach-xxx directories
and plat-s3c24xx dir. to just one mach-s3c24xx for them.
I think this should be sent to upstream via samsung tree because
this touches many samsung stuff.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
[for the gadget part:]
Acked-by: Felipe Balbi <balbi@ti.com>
[for the framebuffer (video) part:]
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
[For the watchdog-part:]
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 877b107f77a7..3aa52ba1398a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -170,7 +170,7 @@ config HAVE_S3C2410_WATCHDOG | |||
170 | 170 | ||
171 | config S3C2410_WATCHDOG | 171 | config S3C2410_WATCHDOG |
172 | tristate "S3C2410 Watchdog" | 172 | tristate "S3C2410 Watchdog" |
173 | depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG | 173 | depends on HAVE_S3C2410_WATCHDOG |
174 | select WATCHDOG_CORE | 174 | select WATCHDOG_CORE |
175 | help | 175 | help |
176 | Watchdog timer block in the Samsung SoCs. This will reboot | 176 | Watchdog timer block in the Samsung SoCs. This will reboot |