diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2014-02-25 07:40:37 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2014-02-25 07:40:37 +0000 |
commit | c3bb517174988117582d692ee52df37fe636fb3d (patch) | |
tree | e70ea06f2cc047626d0114a399c6830d35427390 /sys/sparc64/pci | |
parent | 89c1656950c1917eb3cb0c610360fa529d36dfef (diff) | |
parent | 362a42b214ff6f5ba0d376345a37d640d3017bfc (diff) | |
download | src-c3bb517174988117582d692ee52df37fe636fb3d.tar.gz src-c3bb517174988117582d692ee52df37fe636fb3d.zip |
Merge from head up to r262472.
Notes
Notes:
svn path=/projects/clang-sparc64/; revision=262473
Diffstat (limited to 'sys/sparc64/pci')
-rw-r--r-- | sys/sparc64/pci/fire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c index ff47487c55a8..275526015254 100644 --- a/sys/sparc64/pci/fire.c +++ b/sys/sparc64/pci/fire.c @@ -1688,7 +1688,7 @@ static int fire_alloc_msix(device_t dev, device_t child, int *irq) { struct fire_softc *sc; - u_int i, msiq; + int i, msiq; sc = device_get_softc(dev); if ((sc->sc_flags & FIRE_MSIX) == 0) |