diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /arch/arm/kernel/ecard.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/kernel/ecard.c')
| -rw-r--r-- | arch/arm/kernel/ecard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index ab4ad9562eee..b9a74a741d00 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
| @@ -883,7 +883,7 @@ static ssize_t ecard_show_resources(struct device *dev, struct device_attribute | |||
| 883 | int i; | 883 | int i; |
| 884 | 884 | ||
| 885 | for (i = 0; i < ECARD_NUM_RESOURCES; i++) | 885 | for (i = 0; i < ECARD_NUM_RESOURCES; i++) |
| 886 | str += sprintf(str, "%08lx %08lx %08lx\n", | 886 | str += sprintf(str, "%08x %08x %08lx\n", |
| 887 | ec->resource[i].start, | 887 | ec->resource[i].start, |
| 888 | ec->resource[i].end, | 888 | ec->resource[i].end, |
| 889 | ec->resource[i].flags); | 889 | ec->resource[i].flags); |