diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 10:01:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 10:01:16 -0700 |
| commit | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (patch) | |
| tree | 740769ab145ed72af4d00ea8e4d55ebcef337fce /drivers/ide/palm_bk3710.c | |
| parent | 723e9db7a46e328527cc3da2b478b831184fe828 (diff) | |
| parent | a2d10568fd3965fffeb29a3a6f29966dd3801727 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
ide: fixup for fujitsu disk
ide: convert to ->proc_fops
at91_ide: remove headers specific for at91sam9263
IDE: palm_bk3710: convert clock usage after clkdev conversion
ide: fix races in handling of user-space SET XFER commands
ide: allow ide_dev_read_id() to be called from the IRQ context
ide: ide-taskfile.c fix style problems
drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST
ide-tape: fix handling of postponed rqs
ide-tape: convert to ide_debug_log macro
ide-tape: fix debug call
ide: Fix annoying warning in ide_pio_bytes().
IDE: Save a call to PageHighMem()
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; |