diff --git a/[refs] b/[refs]
index 660045d0a4a1..001e9f1a9ff1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8349e5aeaadd160b7cce554a62a05be4b2d894aa
+refs/heads/master: 11ace0c1defc4d1fe78afd29319bedef36da7078
diff --git a/trunk/drivers/ata/pata_octeon_cf.c b/trunk/drivers/ata/pata_octeon_cf.c
index d8df93b2a028..1d61d5d278fa 100644
--- a/trunk/drivers/ata/pata_octeon_cf.c
+++ b/trunk/drivers/ata/pata_octeon_cf.c
@@ -921,7 +921,6 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
 
 static struct platform_driver octeon_cf_driver = {
 	.probe		= octeon_cf_probe,
-	.remove		= ata_platform_remove_one,
 	.driver		= {
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,