diff --git a/[refs] b/[refs]
index 543c5ac627e8..a9085a343a02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7ccc51db9f10ed2eaa4cd1777181972a23754e
+refs/heads/master: 418dc1f5a805822fcf1118804ddc689a4156db4a
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 5a0b67a602df..42d43b55fb8f 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -71,7 +71,7 @@ static unsigned int ata_dev_xfermask(struct ata_port *ap,
 static unsigned int ata_unique_id = 1;
 static struct workqueue_struct *ata_wq;
 
-int atapi_enabled = 0;
+int atapi_enabled = 1;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");