diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-10 12:36:23 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-10 12:36:23 (GMT) |
| commit | fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f (patch) | |
| tree | 1d0c420d4eaff48cf2486f10dded8d551241ee94 /arch/x86/platform/ts5500 | |
| parent | 6731b0d611a1274f9e785fa0189ac2aeeabd0591 (diff) | |
| parent | a0cba2179ea4c1820fce2ee046b6ed90ecc56196 (diff) | |
| download | linux-fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f.tar.xz | |
Merge branch 'linus' into timers/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/ts5500')
| -rw-r--r-- | arch/x86/platform/ts5500/ts5500.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/platform/ts5500/ts5500.c b/arch/x86/platform/ts5500/ts5500.c index baf16e7..fd39301 100644 --- a/arch/x86/platform/ts5500/ts5500.c +++ b/arch/x86/platform/ts5500/ts5500.c @@ -23,7 +23,7 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/leds.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/platform_data/gpio-ts5500.h> #include <linux/platform_data/max197.h> #include <linux/platform_device.h> @@ -345,7 +345,3 @@ error: return err; } device_initcall(ts5500_init); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>"); -MODULE_DESCRIPTION("Technologic Systems TS-5500 platform driver"); |