From e1bc0f1b8d596292bf45c8607c02889fe51fa26d Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 16 Oct 1999 05:11:46 +0000 Subject: Remove name field from controller information. Fix name setting in pc98 case that I missed before. Attempt to get the irq for the PCIC first from the loader env var and second from the config system. I've been able to boot my laptop with a kernel that hardwired the irq to 10. This should allow boot -c to finally start working for pcic irq, but I've not tested that. Add $FreeBSD$ to slot.h. --- sys/pccard/slot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sys/pccard/slot.h') diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h index 86dd76b..07e4d0d 100644 --- a/sys/pccard/slot.h +++ b/sys/pccard/slot.h @@ -31,6 +31,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #ifndef _PCCARD_SLOT_H @@ -72,7 +74,6 @@ struct slot_ctrl { int maxio; /* Number of allowed I/O windows */ int irqs; /* IRQ's that are allowed */ u_int *imask; /* IRQ mask for the PCIC controller */ - char *name; /* controller name */ /* * The rest is maintained by the mainline PC-CARD code. -- cgit v1.1