diff options
| author | Warner Losh <imp@FreeBSD.org> | 1999-10-16 05:11:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 1999-10-16 05:11:46 +0000 |
| commit | 35c0baa6b7a775a1791dc5c343c56967635ef1fe (patch) | |
| tree | 820c8ec1fc65545034bd000f73b5676cc4d8548d /sys/pccard/slot.h | |
| parent | 3709f518cfa4c1a0dc31c00e0f9d26df4b43280a (diff) | |
| download | src-35c0baa6b7a775a1791dc5c343c56967635ef1fe.tar.gz src-35c0baa6b7a775a1791dc5c343c56967635ef1fe.zip | |
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.
Notes
Notes:
svn path=/head/; revision=52281
Diffstat (limited to 'sys/pccard/slot.h')
| -rw-r--r-- | sys/pccard/slot.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h index 86dd76b8dba3..07e4d0d23fbd 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. |