diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/amba/bus.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/amba/bus.c')
| -rw-r--r-- | drivers/amba/bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 889855d8d9f9..9e3e2a69c03a 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c | |||
| @@ -180,8 +180,9 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL) | |||
| 180 | amba_attr(id, "%08x\n", dev->periphid); | 180 | amba_attr(id, "%08x\n", dev->periphid); |
| 181 | amba_attr(irq0, "%u\n", dev->irq[0]); | 181 | amba_attr(irq0, "%u\n", dev->irq[0]); |
| 182 | amba_attr(irq1, "%u\n", dev->irq[1]); | 182 | amba_attr(irq1, "%u\n", dev->irq[1]); |
| 183 | amba_attr(resource, "\t%08lx\t%08lx\t%08lx\n", | 183 | amba_attr(resource, "\t%016llx\t%016llx\t%016lx\n", |
| 184 | dev->res.start, dev->res.end, dev->res.flags); | 184 | (unsigned long long)dev->res.start, (unsigned long long)dev->res.end, |
| 185 | dev->res.flags); | ||
| 185 | 186 | ||
| 186 | /** | 187 | /** |
| 187 | * amba_device_register - register an AMBA device | 188 | * amba_device_register - register an AMBA device |