diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:22:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:22:56 -0700 |
| commit | 5f48b338cd28f4095697a174d7e3e72084aca893 (patch) | |
| tree | 3e425801e8da2ffdfd6a88c3f494032bc512a5fa /arch/sparc64/kernel/pci.c | |
| parent | f09cc910fe3af7e63298105bc0482653eb534c3c (diff) | |
| parent | 29f139ce27c7e64a3e8575afa8deb46cde09db0a (diff) | |
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]: ARRAY_SIZE() cleanup
[SPARC64]: small Makefile cleanups
[SPARC64]: Stop using __do_IRQ().
[SPARC64]: Update defconfig.
Diffstat (limited to 'arch/sparc64/kernel/pci.c')
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 9b808640a19..63b3ebc0c3c 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -207,8 +207,7 @@ static struct { { "SUNW,sun4v-pci", sun4v_pci_init }, { "pciex108e,80f0", fire_pci_init }, }; -#define PCI_NUM_CONTROLLER_TYPES (sizeof(pci_controller_table) / \ - sizeof(pci_controller_table[0])) +#define PCI_NUM_CONTROLLER_TYPES ARRAY_SIZE(pci_controller_table) static int __init pci_controller_init(const char *model_name, int namelen, struct device_node *dp) { |