aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2008-08-10 10:00:14 +0000
committerWarner Losh <imp@FreeBSD.org>2008-08-10 10:00:14 +0000
commitd2155f2f19c8c66ea4e69d34df26d042fa61dc7b (patch)
tree9c511952f7400b4461766216defb66800dfb323d /sys
parent8e6604f8d51a037782d27a1f4e1c182715c2d1ce (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files2
-rw-r--r--sys/dev/sis/if_sis.c (renamed from sys/pci/if_sis.c)2
-rw-r--r--sys/dev/sis/if_sisreg.h (renamed from sys/pci/if_sisreg.h)0
-rw-r--r--sys/modules/sis/Makefile2
4 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index fdf71422408a..107ec68447ed 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1100,6 +1100,7 @@ dev/si/si3_t225.c optional si
dev/si/si_eisa.c optional si eisa
dev/si/si_isa.c optional si isa
dev/si/si_pci.c optional si pci
+dev/sis/if_sis.c optional sis pci
dev/sk/if_sk.c optional sk pci
dev/smbus/smb.c optional smb
dev/smbus/smbconf.c optional smbus
@@ -2085,7 +2086,6 @@ pci/amdsmb.c optional amdsmb pci
pci/if_mn.c optional mn pci
pci/if_pcn.c optional pcn pci
pci/if_rl.c optional rl pci
-pci/if_sis.c optional sis pci
pci/if_ste.c optional ste pci
pci/if_tl.c optional tl pci
pci/if_wb.c optional wb pci
diff --git a/sys/pci/if_sis.c b/sys/dev/sis/if_sis.c
index f5fbe1ffd771..e5292ebf5e3d 100644
--- a/sys/pci/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
#define SIS_USEIOSPACE
-#include <pci/if_sisreg.h>
+#include <dev/sis/if_sisreg.h>
MODULE_DEPEND(sis, pci, 1, 1, 1);
MODULE_DEPEND(sis, ether, 1, 1, 1);
diff --git a/sys/pci/if_sisreg.h b/sys/dev/sis/if_sisreg.h
index 7f93062e646e..7f93062e646e 100644
--- a/sys/pci/if_sisreg.h
+++ b/sys/dev/sis/if_sisreg.h
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index d16611b83edd..c98dda062f3d 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/sis
KMOD= if_sis
SRCS= if_sis.c device_if.h bus_if.h pci_if.h