diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /drivers/ide/pmac.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/ide/pmac.c')
| -rw-r--r-- | drivers/ide/pmac.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 183fa38760d8..ebcf8e470a97 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
| @@ -1400,8 +1400,11 @@ static struct of_device_id pmac_ide_macio_match[] = | |||
| 1400 | 1400 | ||
| 1401 | static struct macio_driver pmac_ide_macio_driver = | 1401 | static struct macio_driver pmac_ide_macio_driver = |
| 1402 | { | 1402 | { |
| 1403 | .name = "ide-pmac", | 1403 | .driver = { |
| 1404 | .match_table = pmac_ide_macio_match, | 1404 | .name = "ide-pmac", |
| 1405 | .owner = THIS_MODULE, | ||
| 1406 | .of_match_table = pmac_ide_macio_match, | ||
| 1407 | }, | ||
| 1405 | .probe = pmac_ide_macio_attach, | 1408 | .probe = pmac_ide_macio_attach, |
| 1406 | .suspend = pmac_ide_macio_suspend, | 1409 | .suspend = pmac_ide_macio_suspend, |
| 1407 | .resume = pmac_ide_macio_resume, | 1410 | .resume = pmac_ide_macio_resume, |