diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
| commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
| tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/powerpc/sysdev/tsi108_dev.c | |
| parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
| parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'arch/powerpc/sysdev/tsi108_dev.c')
| -rw-r--r-- | arch/powerpc/sysdev/tsi108_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c index be2808a292f7..d4d15aaf18fa 100644 --- a/arch/powerpc/sysdev/tsi108_dev.c +++ b/arch/powerpc/sysdev/tsi108_dev.c | |||
| @@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(void) | |||
| 84 | 84 | ||
| 85 | ret = of_address_to_resource(np, 0, &r[0]); | 85 | ret = of_address_to_resource(np, 0, &r[0]); |
| 86 | DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", | 86 | DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", |
| 87 | __FUNCTION__,r[0].name, r[0].start, r[0].end); | 87 | __func__,r[0].name, r[0].start, r[0].end); |
| 88 | if (ret) | 88 | if (ret) |
| 89 | goto err; | 89 | goto err; |
| 90 | 90 | ||
| @@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(void) | |||
| 93 | r[1].end = irq_of_parse_and_map(np, 0); | 93 | r[1].end = irq_of_parse_and_map(np, 0); |
| 94 | r[1].flags = IORESOURCE_IRQ; | 94 | r[1].flags = IORESOURCE_IRQ; |
| 95 | DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", | 95 | DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", |
| 96 | __FUNCTION__,r[1].name, r[1].start, r[1].end); | 96 | __func__,r[1].name, r[1].start, r[1].end); |
| 97 | 97 | ||
| 98 | tsi_eth_dev = | 98 | tsi_eth_dev = |
| 99 | platform_device_register_simple("tsi-ethernet", i++, &r[0], | 99 | platform_device_register_simple("tsi-ethernet", i++, &r[0], |