git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
avr32
/
mach-at32ap
/
at32ap700x.c
diff --git
a/arch/avr32/mach-at32ap/at32ap700x.c
b/arch/avr32/mach-at32ap/at32ap700x.c
index
aa677e2
..
7fbf0dc
100644
(file)
--- a/
arch/avr32/mach-at32ap/at32ap700x.c
+++ b/
arch/avr32/mach-at32ap/at32ap700x.c
@@
-1043,8
+1043,9
@@
void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
data->regs = (void __iomem *)pdev->resource[0].start;
}
+ pdev->id = line;
pdata = pdev->dev.platform_data;
- pdata->num =
portnr
;
+ pdata->num =
line
;
at32_usarts[line] = pdev;
}