diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-04-13 14:44:42 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-04-13 14:44:42 +0000 |
| commit | 5ad6ade5e85987b54b0e14483b27ed413a39ff2d (patch) | |
| tree | 994b39a0991f3c1555628c557e4dc57865e79b78 /sys/dev/ic/ar5xxx.h | |
| parent | 05c098915e64978c768534c33db5f8902e731788 (diff) | |
The integrated Atheros NICs found in IBM/Lenovo ThinkPads use the same
device ID for old AR5212-based 32bit and new AR5424-based 64bit (PCI
Express Mini Card) interfaces. Use an extra check to look if the card
is 64bit and attach it as a single chip device. This prevents a panic
when attaching the device on some laptops like the T60.
Tested on a T42 (old AR5212 Mini PCI interface),
Tested on a T60 (new AR5424 Mini Card interface)
Nevertheless, the AR5424 does not work yet.
Thanks to Stefan Konrath
Diffstat (limited to 'sys/dev/ic/ar5xxx.h')
| -rw-r--r-- | sys/dev/ic/ar5xxx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h index 5b1692c7197..eca6daac97f 100644 --- a/sys/dev/ic/ar5xxx.h +++ b/sys/dev/ic/ar5xxx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5xxx.h,v 1.39 2007/03/12 01:04:52 reyk Exp $ */ +/* $OpenBSD: ar5xxx.h,v 1.40 2007/04/13 14:44:41 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -1937,7 +1937,7 @@ __BEGIN_DECLS const char *ath_hal_probe(u_int16_t, u_int16_t); struct ath_hal *ath_hal_attach(u_int16_t, void *, bus_space_tag_t, - bus_space_handle_t, HAL_STATUS *); + bus_space_handle_t, u_int, HAL_STATUS *); u_int16_t ath_hal_computetxtime(struct ath_hal *, const HAL_RATE_TABLE *, u_int32_t, u_int16_t, HAL_BOOL); |