Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/macio: Fix probing of macio devices by using the right of match table
  agp/uninorth: Fix oops caused by flushing too much
  powerpc/pasemi: Update MAINTAINERS file
  powerpc/cell: Fix integer constant warning
  powerpc/kprobes: Remove resume_execution() in kprobes
  powerpc/macio: Don't dereference pointer before null check

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 12946c5f583f..53cce3a5da23 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -584,9 +584,11 @@ static struct of_device_id rackmeter_match[] = {
 };
 
 static struct macio_driver rackmeter_driver = {
-        .name = "rackmeter",
-        .owner = THIS_MODULE,
-        .match_table = rackmeter_match,
+        .driver = {
+                .name = "rackmeter",
+                .owner = THIS_MODULE,
+                .of_match_table = rackmeter_match,
+        },
         .probe = rackmeter_probe,
         .remove = __devexit_p(rackmeter_remove),
         .shutdown = rackmeter_shutdown,