diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-04 14:43:45 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 14:43:45 +0300 |
commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
tree | e7ffdc043a2847f410d654d8e99e001f3138937a /drivers/serial/amba-pl010.c | |
parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
download | op-kernel-dev-7590d1defdc720a97a9e186f45f529c4ae1b40f7.zip op-kernel-dev-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.gz |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'drivers/serial/amba-pl010.c')
-rw-r--r-- | drivers/serial/amba-pl010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index b09a638..50441ff 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -782,7 +782,7 @@ static int pl010_resume(struct amba_device *dev) return 0; } -static struct amba_id pl010_ids[] __initdata = { +static struct amba_id pl010_ids[] = { { .id = 0x00041010, .mask = 0x000fffff, |