lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel

Browse Source
This commit is contained in:
Russell King
2009-05-29 10:04:24 +01:00
committed by Russell King
parent 9af5324a07 77bbca138c
commit 42f1d2e06a
251 changed files with 14657 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rtc/rtc-pl030.c
View File

@@ -102,7 +102,7 @@ static const struct rtc_class_ops pl030_ops = {
.set_alarm = pl030_set_alarm,
};
static int pl030_probe(struct amba_device *dev, void *id)
static int pl030_probe(struct amba_device *dev, struct amba_id *id)
{
struct pl030_rtc *rtc;
int ret;

2
drivers/rtc/rtc-pl031.c
View File

@@ -127,7 +127,7 @@ static int pl031_remove(struct amba_device *adev)
return 0;
}
static int pl031_probe(struct amba_device *adev, void *id)
static int pl031_probe(struct amba_device *adev, struct amba_id *id)
{
int ret;
struct pl031_local *ldata;