diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index b5fe74222f25..35fa610cafc6 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.c,v 1.3 1998/11/07 14:33:46 nsouch Exp $
+ *	$Id: iicbus.c,v 1.4 1998/11/08 18:42:34 nsouch Exp $
  *
  */
 
@@ -107,8 +107,6 @@ static device_method_t iicbus_methods[] = {
         DEVMETHOD(bus_print_child,      iicbus_print_child),
         DEVMETHOD(bus_read_ivar,        iicbus_read_ivar),
         DEVMETHOD(bus_write_ivar,       iicbus_write_ivar),
-        DEVMETHOD(bus_create_intr,      bus_generic_create_intr),
-        DEVMETHOD(bus_connect_intr,     bus_generic_connect_intr),
 
         { 0, 0 }
 };
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 38e0bd9a5682..f4056ce837ad 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iiconf.c,v 1.1.1.1 1998/09/03 20:51:50 nsouch Exp $
+ *	$Id: iiconf.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -213,7 +213,7 @@ iicbus_block_read(device_t bus, u_char slave, char *buf, int len, int *read)
 u_char
 iicbus_get_addr(device_t dev)
 {
-	u_long addr;
+	uintptr_t addr;
 	device_t parent = device_get_parent(dev);
 
 	BUS_READ_IVAR(parent, dev, IICBUS_IVAR_ADDR, &addr);
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 8fe67dbe84cb..dbf417b72221 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbconf.c,v 1.1.1.1 1998/09/03 20:52:54 nsouch Exp $
+ *	$Id: smbconf.c,v 1.2 1998/10/31 11:39:54 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -171,7 +171,7 @@ smbus_release_bus(device_t bus, device_t dev)
 u_char
 smbus_get_addr(device_t dev)
 {
-	u_long addr;
+	uintptr_t addr;
 	device_t parent = device_get_parent(dev);
 
 	BUS_READ_IVAR(parent, dev, SMBUS_IVAR_ADDR, &addr);
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index af8ddc3b213d..f662d0b0629d 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.c,v 1.1.1.1 1998/09/03 20:52:54 nsouch Exp $
+ *	$Id: smbus.c,v 1.2 1998/10/31 11:39:54 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -81,8 +81,6 @@ static device_method_t smbus_methods[] = {
         DEVMETHOD(bus_print_child,      smbus_print_child),
         DEVMETHOD(bus_read_ivar,        smbus_read_ivar),
         DEVMETHOD(bus_write_ivar,       bus_generic_write_ivar),
-        DEVMETHOD(bus_create_intr,      bus_generic_create_intr),
-        DEVMETHOD(bus_connect_intr,     bus_generic_connect_intr),
 
         { 0, 0 }
 };