31c31
< __FBSDID("$FreeBSD: head/sys/dev/cxgb/cxgb_main.c 172105 2007-09-09 20:26:02Z kmacy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/cxgb/cxgb_main.c 172109 2007-09-10 00:59:51Z kmacy $");
390c390
< int i, reg, error = 0;
---
> int i, error = 0;
394c394
< int msi_needed;
---
> int msi_needed, reg;
399c399,404
<
---
> ai = cxgb_get_adapter_info(dev);
>
> /*
> * XXX not really related but a recent addition
> */
> #ifdef MSI_SUPPORTED
411d415
< ai = cxgb_get_adapter_info(dev);
418c422
<
---
> #endif
1333a1338
> #ifdef FIRMWARE_LATEST
1334a1340,1343
> #else
> struct firmware *tpeeprom;
> #endif
>
1389a1399
> #ifdef FIRMWARE_LATEST
1390a1401,1403
> #else
> struct firmware *tpsram;
> #endif
1830c1843
< struct mbuf *m0, *m = NULL;
---
> struct mbuf *m = NULL;
1858a1872
> #ifdef notyet
1860,1872d1873
< #ifdef INVARIANTS
< /*
< * Clean up after net stack sloppiness
< * before calling m_sanity
< */
< m0 = m->m_next;
< while (m0) {
< m0->m_flags &= ~M_PKTHDR;
< m0 = m0->m_next;
< }
< m_sanity(m0, 0);
< m0 = m;
< #endif
1881a1883
> #endif