of: Remove duplicate fields from of_platform_driver

[safe/jmp/linux-2.6] / drivers / input / misc / sparcspkr.c

diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 0d45422..1dacae4 100644 (file)
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -259,8 +259,11 @@ static const struct of_device_id bbc_beep_match[] = {
 };
 
 static struct of_platform_driver bbc_beep_driver = {
-       .name           = "bbcbeep",
-       .match_table    = bbc_beep_match,
+       .driver = {
+               .name = "bbcbeep",
+               .owner = THIS_MODULE,
+               .of_match_table = bbc_beep_match,
+       },
        .probe          = bbc_beep_probe,
        .remove         = __devexit_p(bbc_remove),
        .shutdown       = sparcspkr_shutdown,
@@ -338,8 +341,11 @@ static const struct of_device_id grover_beep_match[] = {
 };
 
 static struct of_platform_driver grover_beep_driver = {
-       .name           = "groverbeep",
-       .match_table    = grover_beep_match,
+       .driver = {
+               .name = "groverbeep",
+               .owner = THIS_MODULE,
+               .of_match_table = grover_beep_match,
+       },
        .probe          = grover_beep_probe,
        .remove         = __devexit_p(grover_remove),
        .shutdown       = sparcspkr_shutdown,