summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:47:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:47:06 -0800
commit37cfc3f67db9f2d907f6bfcfae590cdbbef623e8 (patch)
treeb573983938838dd76b40a7b53b3744472041720f /drivers/tty
parent38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (diff)
parent6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546 (diff)
downloadop-kernel-dev-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.zip
op-kernel-dev-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: sparc32: remove unused file: include/asm/pgtsun4.h sparc32: fix PAGE_SIZE definition sparc32: enable different preemptions models sparc32: support atomic64_t apbuart: fix section mismatch warning sparc32: drop useless preprocessor conditional in atomic_32.h sparc32: drop unused atomic24 support
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/apbuart.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 77554fd..7162f70 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -577,7 +577,7 @@ static int __devinit apbuart_probe(struct platform_device *op)
return 0;
}
-static struct of_device_id __initdata apbuart_match[] = {
+static struct of_device_id apbuart_match[] = {
{
.name = "GAISLER_APBUART",
},
@@ -597,7 +597,7 @@ static struct platform_driver grlib_apbuart_of_driver = {
};
-static int grlib_apbuart_configure(void)
+static int __init grlib_apbuart_configure(void)
{
struct device_node *np;
int line = 0;
OpenPOWER on IntegriCloud