From 55531ce67cee6f422c27edac15e109f2dfc31dbe Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:34:38 +0000 Subject: [PATCH] --- yaml --- r: 18379 b: refs/heads/master c: ad3ed31c682d956d2187e562635c55c8c74c1021 h: refs/heads/master i: 18377: 1061db63dd5a4e971d424e85096c6566a6adcaf8 18375: 5d198f6130aecedccdcac5a8f6d7a4fbda6b8b06 v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/drivers.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e544192cd9f..f23942958208 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83dfb8b67522f6cf1fc5771a8be0a9095eea65d4 +refs/heads/master: ad3ed31c682d956d2187e562635c55c8c74c1021 diff --git a/trunk/arch/parisc/kernel/drivers.c b/trunk/arch/parisc/kernel/drivers.c index 1eaa0d37f677..2d804e2d16d1 100644 --- a/trunk/arch/parisc/kernel/drivers.c +++ b/trunk/arch/parisc/kernel/drivers.c @@ -173,8 +173,6 @@ int register_parisc_driver(struct parisc_driver *driver) WARN_ON(driver->drv.probe != NULL); WARN_ON(driver->drv.remove != NULL); - driver->drv.probe = parisc_driver_probe; - driver->drv.remove = parisc_driver_remove; driver->drv.name = driver->name; return driver_register(&driver->drv); @@ -575,6 +573,8 @@ struct bus_type parisc_bus_type = { .name = "parisc", .match = parisc_generic_match, .dev_attrs = parisc_device_attrs, + .probe = parisc_driver_probe, + .remove = parisc_driver_remove, }; /**