Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[cascardo/linux.git] / drivers / net / ibm_newemac / tah.c

diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 96417ad..30173a9 100644 (file)
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -35,7 +35,7 @@ int __devinit tah_attach(struct of_device *ofdev, int channel)
        return 0;
 }
 
-void __devexit tah_detach(struct of_device *ofdev, int channel)
+void tah_detach(struct of_device *ofdev, int channel)
 {
        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
 
@@ -154,6 +154,10 @@ static int __devexit tah_remove(struct of_device *ofdev)
 
 static struct of_device_id tah_match[] =
 {
+       {
+               .compatible     = "ibm,tah",
+       },
+       /* For backward compat with old DT */
        {
                .type           = "tah",
        },