summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-18 19:55:06 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-18 19:55:06 -0500
commit4b317d212cc23a1d635ca8329c802224178afddf (patch)
treec671d279518dad01e58ff97b639fdb984aa2c9e6 /drivers/ide/ide-cd.c
parent79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff)
parentb286e39207237e2f6929959372bf66d9a8d05a82 (diff)
downloadblackbird-op-linux-4b317d212cc23a1d635ca8329c802224178afddf.tar.gz
blackbird-op-linux-4b317d212cc23a1d635ca8329c802224178afddf.zip
Merge branch 'master'
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index c2f47923d174..421b62d900af 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -3328,8 +3328,8 @@ static ide_proc_entry_t idecd_proc[] = {
#endif
static ide_driver_t ide_cdrom_driver = {
- .owner = THIS_MODULE,
.gen_driver = {
+ .owner = THIS_MODULE,
.name = "ide-cdrom",
.bus = &ide_bus_type,
.probe = ide_cd_probe,
OpenPOWER on IntegriCloud