diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-12-10 05:19:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:40 -0500 |
commit | 7fc39f6d616a852750ddaac86f5e4c3fad804ef8 (patch) | |
tree | 7a18d36ab66806d73c985f066425e1c987ea4ac0 /drivers/rtc | |
parent | a14e18935076ce084c4edbc57883f38e642c8e5d (diff) |
[PATCH] AT91RM9200 RTC
The new Atmel AT91SAM9261 and AT91SAM9260 processors do not have the
internal RTC peripheral. This RTC driver is therefore
AT91RM9200-specific.
This patch renames rtc-at91.c to rtc-at91rm9200.c, and changes the name
of the configuration option.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/rtc/Makefile | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-at91rm9200.c (renamed from drivers/rtc/rtc-at91.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 2a63ab2b47f4..09660e2ab051 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -288,7 +288,7 @@ config RTC_DRV_PL031 | |||
288 | To compile this driver as a module, choose M here: the | 288 | To compile this driver as a module, choose M here: the |
289 | module will be called rtc-pl031. | 289 | module will be called rtc-pl031. |
290 | 290 | ||
291 | config RTC_DRV_AT91 | 291 | config RTC_DRV_AT91RM9200 |
292 | tristate "AT91RM9200" | 292 | tristate "AT91RM9200" |
293 | depends on RTC_CLASS && ARCH_AT91RM9200 | 293 | depends on RTC_CLASS && ARCH_AT91RM9200 |
294 | help | 294 | help |
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index bd4c45d333f0..e6beedacc966 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
@@ -35,5 +35,5 @@ obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o | |||
35 | obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o | 35 | obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o |
36 | obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o | 36 | obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o |
37 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o | 37 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o |
38 | obj-$(CONFIG_RTC_DRV_AT91) += rtc-at91.o | 38 | obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o |
39 | obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o | 39 | obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o |
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91rm9200.c index 5c8addcaf1fb..5c8addcaf1fb 100644 --- a/drivers/rtc/rtc-at91.c +++ b/drivers/rtc/rtc-at91rm9200.c | |||