diff options
author | jhb <jhb@FreeBSD.org> | 2008-08-05 17:39:37 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-08-05 17:39:37 +0000 |
commit | b808cfb9c8b3a6f217bd7cc7f193fcc20a48a854 (patch) | |
tree | 5942b0045125878ddea5ee33d4c3bce980bf01d4 /sys/dev/pcf | |
parent | 3a946f98dc7d355c76b373b26abead5eb6f369d9 (diff) | |
download | FreeBSD-src-b808cfb9c8b3a6f217bd7cc7f193fcc20a48a854.zip FreeBSD-src-b808cfb9c8b3a6f217bd7cc7f193fcc20a48a854.tar.gz |
- Consolidate module version for the pcf module into just pcf.c instead
of having duplicate versions in each bus attachment.
- Add a DRIVER_MODULE() instance so that the iicbus(4) driver will
actually attach to pcf(4) driver instances.
- Fix compile of envctrl.c.
Pointy hat: jhb (3)
Diffstat (limited to 'sys/dev/pcf')
-rw-r--r-- | sys/dev/pcf/envctrl.c | 3 | ||||
-rw-r--r-- | sys/dev/pcf/pcf.c | 5 | ||||
-rw-r--r-- | sys/dev/pcf/pcf_ebus.c | 2 | ||||
-rw-r--r-- | sys/dev/pcf/pcf_isa.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c index 7c1cb1b..d577aa4 100644 --- a/sys/dev/pcf/envctrl.c +++ b/sys/dev/pcf/envctrl.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> +#include <dev/iicbus/iicbus.h> #include <dev/iicbus/iiconf.h> #include <dev/pcf/pcfvar.h> #include "iicbus_if.h" @@ -189,5 +190,3 @@ envctrl_detach(device_t dev) DRIVER_MODULE(envctrl, ebus, envctrl_driver, envctrl_devclass, 0, 0); DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0); -MODULE_DEPEND(envctrl, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER); -MODULE_VERSION(envctrl, PCF_MODVER); diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c index e6c9967..e774812 100644 --- a/sys/dev/pcf/pcf.c +++ b/sys/dev/pcf/pcf.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> +#include <dev/iicbus/iicbus.h> #include <dev/iicbus/iiconf.h> #include <dev/pcf/pcfvar.h> #include "iicbus_if.h" @@ -478,3 +479,7 @@ error: return (error); } + +DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0); +MODULE_DEPEND(pcf, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER); +MODULE_VERSION(pcf, PCF_MODVER); diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c index ad0e36e..d354d9a 100644 --- a/sys/dev/pcf/pcf_ebus.c +++ b/sys/dev/pcf/pcf_ebus.c @@ -252,5 +252,3 @@ pcf_ebus_detach(device_t dev) } DRIVER_MODULE(pcf_ebus, ebus, pcf_ebus_driver, pcf_ebus_devclass, 0, 0); -MODULE_DEPEND(pcf_ebus, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER); -MODULE_VERSION(pcf_ebus, PCF_MODVER); diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c index 3bb1ec6..e811635 100644 --- a/sys/dev/pcf/pcf_isa.c +++ b/sys/dev/pcf/pcf_isa.c @@ -209,5 +209,3 @@ pcf_isa_detach(device_t dev) } DRIVER_MODULE(pcf_isa, isa, pcf_isa_driver, pcf_isa_devclass, 0, 0); -MODULE_DEPEND(pcf_isa, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER); -MODULE_VERSION(pcf_isa, PCF_MODVER); |