diff options
| author | Bharat Nihalani <bnihalani@nvidia.com> | 2010-04-23 11:54:47 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-04-23 13:31:04 -0700 |
| commit | d36a6ab12add32d60f7d398feb052d178f71bede (patch) | |
| tree | 49329e9d4c6149b24a25e70ba407a2bcd85ff38c | |
| parent | f0a12f3a7b3aac3890a1161de9e1cb5f5d263919 (diff) | |
tegra-kernel: Fix section mismatch warnings
Bug 676157: Kernel builds in 9.12.8, 9.12.9 cause section mismatch warnings
Change-Id: Ic288f077d24b03f9d6af2d20dcb01a1bfce25599
Reviewed-on: http://git-master/r/1195
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Tested-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/iovmm-gart.c | 8 | ||||
| -rw-r--r-- | drivers/input/mouse/nvec_mouse.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/iovmm-gart.c b/arch/arm/mach-tegra/iovmm-gart.c index a5630f598840..e11b7d8b821b 100644 --- a/arch/arm/mach-tegra/iovmm-gart.c +++ b/arch/arm/mach-tegra/iovmm-gart.c @@ -65,8 +65,8 @@ static void gart_map_pfn(struct tegra_iovmm_device *, static struct tegra_iovmm_domain *gart_alloc_domain( struct tegra_iovmm_device *, struct tegra_iovmm_client *); -static int __init gart_probe(struct platform_device *); -static int __devexit gart_remove(struct platform_device *); +static int gart_probe(struct platform_device *); +static int gart_remove(struct platform_device *); static int gart_suspend(struct platform_device *, pm_message_t); static int gart_resume(struct platform_device *); @@ -139,7 +139,7 @@ static int gart_resume(struct platform_device *pdev) return 0; } -static int __devexit gart_remove(struct platform_device *pdev) +static int gart_remove(struct platform_device *pdev) { struct gart_device *gart = platform_get_drvdata(pdev); @@ -162,7 +162,7 @@ static int __devexit gart_remove(struct platform_device *pdev) return 0; } -static int __init gart_probe(struct platform_device *pdev) +static int gart_probe(struct platform_device *pdev) { struct gart_device *gart = NULL; struct resource *res, *res_remap; diff --git a/drivers/input/mouse/nvec_mouse.c b/drivers/input/mouse/nvec_mouse.c index dabb52c5d8d9..412e9603900f 100644 --- a/drivers/input/mouse/nvec_mouse.c +++ b/drivers/input/mouse/nvec_mouse.c @@ -426,7 +426,7 @@ static void nvec_mouse_remove(struct nvec_device *dev) mouse = NULL;
}
-static struct nvec_driver nvec_mouse = {
+static struct nvec_driver nvec_mouse_driver = {
.name = "nvec_mouse",
.probe = nvec_mouse_probe,
.remove = nvec_mouse_remove,
@@ -436,7 +436,7 @@ static struct nvec_driver nvec_mouse = { static struct nvec_device nvec_mouse_device = {
.name = "nvec_mouse",
- .driver = &nvec_mouse,
+ .driver = &nvec_mouse_driver,
};
static int __init nvec_mouse_init(void)
@@ -457,7 +457,7 @@ static int __init nvec_mouse_init(void) goto fail;
}
- err = nvec_register_driver(&nvec_mouse);
+ err = nvec_register_driver(&nvec_mouse_driver);
if (err)
{
pr_err("**nvec_mouse_init: nvec_register_driver: fail\n");
@@ -468,7 +468,7 @@ static int __init nvec_mouse_init(void) if (err)
{
pr_err("**nvec_mouse_init: nvec_device_add: fail\n");
- nvec_unregister_driver(&nvec_mouse);
+ nvec_unregister_driver(&nvec_mouse_driver);
goto fail_register;
}
@@ -483,7 +483,7 @@ fail: static void __exit nvec_mouse_exit(void)
{
nvec_unregister_device(&nvec_mouse_device);
- nvec_unregister_driver(&nvec_mouse);
+ nvec_unregister_driver(&nvec_mouse_driver);
}
module_init(nvec_mouse_init);
|