diff options
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/brktree_reg.h | 3 | ||||
| -rw-r--r-- | sys/pci/brooktree848.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/pci/brktree_reg.h b/sys/pci/brktree_reg.h index 0ae8f30962055..35ba615af1276 100644 --- a/sys/pci/brktree_reg.h +++ b/sys/pci/brktree_reg.h @@ -432,9 +432,6 @@ struct bktr_softc { #define TUNER_INITALIZED 0x00000001 #define TUNER_OPEN 0x00000002 u_short fps; /* frames per second */ -#ifdef DEVFS - void *devfs_token; -#endif struct meteor_video video; struct TVTUNER tuner; struct CARDTYPE card; diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c index b5d49f58766f7..7f9e8385066dc 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.c @@ -883,8 +883,10 @@ bktr_attach( ATTACH_ARGS ) probeCard( bktr, TRUE ); #ifdef DEVFS - bktr->devfs_token = devfs_add_devswf(&bktr_cdevsw, unit, - DV_CHR, 0, 0, 0644, "brooktree"); + /* XXX This just throw away the token, which should probably be fixed when + DEVFS is finally made really operational. */ + devfs_add_devswf(&bktr_cdevsw, unit, DV_CHR, 0, 0, 0444, "bktr%d", unit); + devfs_add_devswf(&bktr_cdevsw, unit+16, DV_CHR, 0, 0, 0444, "tuner%d", unit); #endif /* DEVFS */ #if __FreeBSD__ > 2 fun = pci_conf_read(tag, PCI_COMMAND_STATUS_REG); |