diff --git a/[refs] b/[refs] index a295d2cf4f68..cc306afe5476 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 571291066d053c34d28de26a6d9d96ac7d171a61 +refs/heads/master: e533a349c0258f38a67afa1c2402a12f46227049 diff --git a/trunk/drivers/hwspinlock/omap_hwspinlock.c b/trunk/drivers/hwspinlock/omap_hwspinlock.c index f21b2ed6e185..292869cc9034 100644 --- a/trunk/drivers/hwspinlock/omap_hwspinlock.c +++ b/trunk/drivers/hwspinlock/omap_hwspinlock.c @@ -142,7 +142,7 @@ static int omap_hwspinlock_probe(struct platform_device *pdev) return ret; } -static int __devexit omap_hwspinlock_remove(struct platform_device *pdev) +static int omap_hwspinlock_remove(struct platform_device *pdev) { struct hwspinlock_device *bank = platform_get_drvdata(pdev); void __iomem *io_base = bank->lock[0].priv - LOCK_BASE_OFFSET; diff --git a/trunk/drivers/hwspinlock/u8500_hsem.c b/trunk/drivers/hwspinlock/u8500_hsem.c index 5a5b3f2e4eb6..401c33bcdb45 100644 --- a/trunk/drivers/hwspinlock/u8500_hsem.c +++ b/trunk/drivers/hwspinlock/u8500_hsem.c @@ -148,7 +148,7 @@ static int u8500_hsem_probe(struct platform_device *pdev) return ret; } -static int __devexit u8500_hsem_remove(struct platform_device *pdev) +static int u8500_hsem_remove(struct platform_device *pdev) { struct hwspinlock_device *bank = platform_get_drvdata(pdev); void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;