diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-07 06:39:31 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-07 06:39:31 +0400 |
| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 (patch) | |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 /drivers/rtc/rtc-pl031.c | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 12e94471b2be5ef9b55b10004a3a2cd819490036 (diff) | |
| download | linux-69259abb64d4da77273bf59accfc9fa79e7165f4.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
Diffstat (limited to 'drivers/rtc/rtc-pl031.c')
| -rw-r--r-- | drivers/rtc/rtc-pl031.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 6c418fe7f288..b7a6690e5b35 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -403,7 +403,7 @@ static int pl031_probe(struct amba_device *adev, struct amba_id *id) } if (request_irq(adev->irq[0], pl031_interrupt, - IRQF_DISABLED | IRQF_SHARED, "rtc-pl031", ldata)) { + IRQF_DISABLED, "rtc-pl031", ldata)) { ret = -EIO; goto out_no_irq; } |