diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-04 20:59:31 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-04 20:59:31 -0700 |
| commit | c8b2da0e80ef3900d3859212c8da8a0cc0db355c (patch) | |
| tree | c3594cef381025a64e1821fe5b8bcb6484aa3df9 /drivers | |
| parent | 13d0b76b93fea4ed31764d30e6cfb4cc79ecf039 (diff) | |
| parent | 8a86a093ca3b924e6c2d5267cffb809965582a8d (diff) | |
| download | linux-stable-c8b2da0e80ef3900d3859212c8da8a0cc0db355c.tar.gz linux-stable-c8b2da0e80ef3900d3859212c8da8a0cc0db355c.tar.bz2 linux-stable-c8b2da0e80ef3900d3859212c8da8a0cc0db355c.zip | |
Merge tag 'at91-ab-4.8-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers
Drivers for 4.8 #2:
- Make memory drivers explicitly non-modular
* tag 'at91-ab-4.8-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
memory: atmel-ebi: make it explicitly non-modular
memory: atmel-sdramc: make it explicitly non-modular
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/memory/atmel-ebi.c | 9 | ||||
| -rw-r--r-- | drivers/memory/atmel-sdramc.c | 11 |
2 files changed, 6 insertions, 14 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index 17d9d3f60f20..f87ad6f5d2dc 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -14,7 +14,7 @@ #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/atmel-matrix.h> #include <linux/mfd/syscon/atmel-smc.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/of_device.h> #include <linux/regmap.h> @@ -648,7 +648,6 @@ static const struct of_device_id at91_ebi_id_table[] = { }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(of, at91_ebi_id_table); static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np) { @@ -764,8 +763,4 @@ static struct platform_driver at91_ebi_driver = { .of_match_table = at91_ebi_id_table, }, }; -module_platform_driver_probe(at91_ebi_driver, at91_ebi_probe); - -MODULE_AUTHOR("Jean-Jacques Hiblot <jjhiblot@traphandler.com>"); -MODULE_DESCRIPTION("Atmel EBI driver"); -MODULE_LICENSE("GPL"); +builtin_platform_driver_probe(at91_ebi_driver, at91_ebi_probe); diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c index a3ebc8a87479..53a341f3b305 100644 --- a/drivers/memory/atmel-sdramc.c +++ b/drivers/memory/atmel-sdramc.c @@ -1,6 +1,8 @@ /* * Atmel (Multi-port DDR-)SDRAM Controller driver * + * Author: Alexandre Belloni <alexandre.belloni@free-electrons.com> + * * Copyright (C) 2014 Atmel * * This program is free software: you can redistribute it and/or modify @@ -20,7 +22,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_device.h> @@ -48,7 +50,6 @@ static const struct of_device_id atmel_ramc_of_match[] = { { .compatible = "atmel,sama5d3-ddramc", .data = &sama5d3_caps, }, {}, }; -MODULE_DEVICE_TABLE(of, atmel_ramc_of_match); static int atmel_ramc_probe(struct platform_device *pdev) { @@ -90,8 +91,4 @@ static int __init atmel_ramc_init(void) { return platform_driver_register(&atmel_ramc_driver); } -module_init(atmel_ramc_init); - -MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@free-electrons.com>"); -MODULE_DESCRIPTION("Atmel (Multi-port DDR-)SDRAM Controller"); +device_initcall(atmel_ramc_init); |