Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299784
b: refs/heads/master
c: 9f9d27e
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Artamonow authored and Haojian Zhuang committed Apr 27, 2012
1 parent dae88a6 commit b987514
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b95ace54a23e2f8ebb032744cebb17c9f43bf651
refs/heads/master: 9f9d27e3f3317f39c91c286b6184f1ca05452968
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-sa1100/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void sa11x0_register_irda(struct irda_platform_data *irda)
}

static struct resource sa1100_rtc_resources[] = {
DEFINE_RES_MEM(0x90010000, 0x9001003f),
DEFINE_RES_MEM(0x90010000, 0x40),
DEFINE_RES_IRQ_NAMED(IRQ_RTC1Hz, "rtc 1Hz"),
DEFINE_RES_IRQ_NAMED(IRQ_RTCAlrm, "rtc alarm"),
};
Expand Down

0 comments on commit b987514

Please sign in to comment.