diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index 0a435ce9d375..5aec40285cde 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.28 2003/04/26 14:10:11 ragge Exp $
+# $NetBSD: GENERIC,v 1.29 2003/10/08 11:09:26 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -148,10 +148,12 @@ ukphy*	at mii? phy ?			# generic unknown PHYs
 # PCMCIA IDE disk
 # PC-Card slot
 wdc1	at pcmcia0 function ?
-wd*	at wdc1 channel ? drive ? flags 0x0000
+atabus1 at wdc1 channel ?
+wd*	at atabus1 drive ? flags 0x0000
 # Compact Flash slot (only memory mapped mode CF can attach)
 wdc0	at pcmcia1 function ?
-wd*	at wdc0 channel ? drive ? flags 0x0000
+atabus0 at wdc0 channel ?
+wd*	at atabus0 drive ? flags 0x0000
 
 # Network Interfaces
 
diff --git a/sys/arch/hpcsh/conf/HPW650PA b/sys/arch/hpcsh/conf/HPW650PA
index a81bd12ea273..f122d3c79986 100644
--- a/sys/arch/hpcsh/conf/HPW650PA
+++ b/sys/arch/hpcsh/conf/HPW650PA
@@ -1,4 +1,4 @@
-#	$NetBSD: HPW650PA,v 1.12 2002/09/18 02:43:59 lukem Exp $
+#	$NetBSD: HPW650PA,v 1.13 2003/10/08 11:09:26 bouyer Exp $
 #
 #	HITACHI PERSONA HPW650PA
 #
@@ -80,7 +80,8 @@ ukphy*	at mii? phy ?			# generic unknown PHYs
 
 # PCMCIA IDE disk
 wdc*	at pcmcia? function ?
-wd*	at wdc? channel ? drive ? flags 0x0000
+atabus* at wdc? channel ?
+wd*	at atabus? drive ? flags 0x0000
 
 # Pseudo-Devices
 pseudo-device	biconsdev	1	# build-in console device