diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 00:52:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 00:52:43 -0700 |
| commit | d66ac4752e891f319fa931ab72efb3352fafa50b (patch) | |
| tree | 8a7c1b152a9103927962d6f398eff8bc76a6dab2 /include/asm-sparc64/device.h | |
| parent | 0ee13079906f0e0b185b13a1fbdaf24d853baa8d (diff) | |
| parent | 5f92c329364c0bf2d3a356da5e8759fbe349f9d1 (diff) | |
| download | op-kernel-dev-d66ac4752e891f319fa931ab72efb3352fafa50b.zip op-kernel-dev-d66ac4752e891f319fa931ab72efb3352fafa50b.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix several bugs in MSI handling.
[SPARC64]: Fix type and constant sizes wrt. sun4u IMAP/ICLR handling.
Diffstat (limited to 'include/asm-sparc64/device.h')
| -rw-r--r-- | include/asm-sparc64/device.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h index d5a4559..5111e87 100644 --- a/include/asm-sparc64/device.h +++ b/include/asm-sparc64/device.h @@ -16,8 +16,6 @@ struct dev_archdata { struct device_node *prom_node; struct of_device *op; - - unsigned int msi_num; }; #endif /* _ASM_SPARC64_DEVICE_H */ |
