diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/ide/palm_bk3710.c | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/ide/palm_bk3710.c')
| -rw-r--r-- | drivers/ide/palm_bk3710.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index 3c1dc0152153..f8eddf05ecb8 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) int i, rc; struct ide_hw hw, *hws[] = { &hw }; - clk = clk_get(&pdev->dev, "IDECLK"); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return -ENODEV; |