diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 9 | ||||
| -rw-r--r-- | sys/dev/alpm/alpm.c (renamed from sys/pci/alpm.c) | 0 | ||||
| -rw-r--r-- | sys/dev/amdpm/amdpm.c (renamed from sys/pci/amdpm.c) | 0 | ||||
| -rw-r--r-- | sys/dev/intpm/intpm.c (renamed from sys/pci/intpm.c) | 2 | ||||
| -rw-r--r-- | sys/dev/intpm/intpmreg.h (renamed from sys/pci/intpmreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/viapm/viapm.c (renamed from sys/pci/viapm.c) | 0 | ||||
| -rw-r--r-- | sys/modules/i2c/controllers/alpm/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/i2c/controllers/amdpm/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/i2c/controllers/intpm/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/i2c/controllers/viapm/Makefile | 2 |
10 files changed, 9 insertions, 10 deletions
diff --git a/sys/conf/files b/sys/conf/files index a895de8..0e853e7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -646,6 +646,7 @@ dev/aic7xxx/aic7xxx_pci.c optional ahc pci dev/aic7xxx/aic7xxx_reg_print.c optional ahc ahc_reg_pretty_print dev/alc/if_alc.c optional alc pci dev/ale/if_ale.c optional ale pci +dev/alpm/alpm.c optional alpm pci dev/altera/avgen/altera_avgen.c optional altera_avgen dev/altera/avgen/altera_avgen_fdt.c optional altera_avgen fdt dev/altera/avgen/altera_avgen_nexus.c optional altera_avgen @@ -654,6 +655,7 @@ dev/altera/sdcard/altera_sdcard_disk.c optional altera_sdcard dev/altera/sdcard/altera_sdcard_io.c optional altera_sdcard dev/altera/sdcard/altera_sdcard_fdt.c optional altera_sdcard fdt dev/altera/sdcard/altera_sdcard_nexus.c optional altera_sdcard +dev/amdpm/amdpm.c optional amdpm pci | nfpm pci dev/amdsmb/amdsmb.c optional amdsmb pci dev/amr/amr.c optional amr dev/amr/amr_cam.c optional amrp amr @@ -1484,6 +1486,7 @@ dev/iicbus/s35390a.c optional s35390a dev/iir/iir.c optional iir dev/iir/iir_ctrl.c optional iir dev/iir/iir_pci.c optional iir pci +dev/intpm/intpm.c optional intpm pci # XXX Work around clang warning, until maintainer approves fix. dev/ips/ips.c optional ips \ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" @@ -2584,7 +2587,7 @@ dev/utopia/idtphy.c optional utopia dev/utopia/suni.c optional utopia dev/utopia/utopia.c optional utopia dev/vge/if_vge.c optional vge - +dev/viapm/viapm.c optional viapm pci dev/vkbd/vkbd.c optional vkbd dev/vr/if_vr.c optional vr pci dev/vt/colors/vt_termcolors.c optional vt @@ -3868,10 +3871,6 @@ opencrypto/cryptodeflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto -pci/alpm.c optional alpm pci -pci/amdpm.c optional amdpm pci | nfpm pci -pci/intpm.c optional intpm pci -pci/viapm.c optional viapm pci rpc/auth_none.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd rpc/auth_unix.c optional krpc | nfslockd | nfsclient | nfscl | nfsd rpc/authunix_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd diff --git a/sys/pci/alpm.c b/sys/dev/alpm/alpm.c index 53b2f9d..53b2f9d 100644 --- a/sys/pci/alpm.c +++ b/sys/dev/alpm/alpm.c diff --git a/sys/pci/amdpm.c b/sys/dev/amdpm/amdpm.c index 63b8fe1..63b8fe1 100644 --- a/sys/pci/amdpm.c +++ b/sys/dev/amdpm/amdpm.c diff --git a/sys/pci/intpm.c b/sys/dev/intpm/intpm.c index 48ff26e..60ad17f 100644 --- a/sys/pci/intpm.c +++ b/sys/dev/intpm/intpm.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <pci/intpmreg.h> +#include <dev/intpm/intpmreg.h> #include "opt_intpm.h" diff --git a/sys/pci/intpmreg.h b/sys/dev/intpm/intpmreg.h index eaebcdd..eaebcdd 100644 --- a/sys/pci/intpmreg.h +++ b/sys/dev/intpm/intpmreg.h diff --git a/sys/pci/viapm.c b/sys/dev/viapm/viapm.c index 0cddd07..0cddd07 100644 --- a/sys/pci/viapm.c +++ b/sys/dev/viapm/viapm.c diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile index 885b983..adddfb7 100644 --- a/sys/modules/i2c/controllers/alpm/Makefile +++ b/sys/modules/i2c/controllers/alpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../pci +.PATH: ${.CURDIR}/../../../../dev/alpm KMOD = alpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ alpm.c diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile index 5f6d7ed..2f6fcec 100644 --- a/sys/modules/i2c/controllers/amdpm/Makefile +++ b/sys/modules/i2c/controllers/amdpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../pci +.PATH: ${.CURDIR}/../../../../dev/amdpm KMOD = amdpm SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ amdpm.c diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile index 7cef578..73d5254 100644 --- a/sys/modules/i2c/controllers/intpm/Makefile +++ b/sys/modules/i2c/controllers/intpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../pci +.PATH: ${.CURDIR}/../../../../dev/intpm KMOD = intpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ opt_intpm.h intpmreg.h intpm.c diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile index 3710030..f08b053 100644 --- a/sys/modules/i2c/controllers/viapm/Makefile +++ b/sys/modules/i2c/controllers/viapm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../pci +.PATH: ${.CURDIR}/../../../../dev/viapm KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ opt_isa.h viapm.c |
