diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-28 05:37:32 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-28 05:37:32 +0200 |
| commit | bf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch) | |
| tree | 566e61e2cfc648c374d15cfc8c661b73e1a471f8 /arch/mips/mti-malta/malta-platform.c | |
| parent | Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff) | |
| parent | Linux 3.6-rc7 (diff) | |
| download | linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip | |
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7
Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.
Diffstat (limited to 'arch/mips/mti-malta/malta-platform.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-platform.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c index 4c35301720e7..80562b81f0f2 100644 --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c @@ -138,11 +138,6 @@ static int __init malta_add_devices(void) if (err) return err; - /* - * Set RTC to BCD mode to support current alarm code. - */ - CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL); - return 0; } |