The patch titled rtc: rtc-s3c: add __devexit and __devinit markers has been added to the -mm tree. Its filename is rtc-rtc-s3c-add-__devexit-and-__devinit-markers.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rtc: rtc-s3c: add __devexit and __devinit markers From: Ben Dooks <ben-linux@xxxxxxxxx> Add the relevant __devinit and __devexit attributes to the rtc-s3c driver. Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx> Acked-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-s3c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/rtc/rtc-s3c.c~rtc-rtc-s3c-add-__devexit-and-__devinit-markers drivers/rtc/rtc-s3c.c --- a/drivers/rtc/rtc-s3c.c~rtc-rtc-s3c-add-__devexit-and-__devinit-markers +++ a/drivers/rtc/rtc-s3c.c @@ -430,7 +430,7 @@ static void s3c_rtc_enable(struct platfo } } -static int s3c_rtc_remove(struct platform_device *dev) +static int __devexit s3c_rtc_remove(struct platform_device *dev) { struct rtc_device *rtc = platform_get_drvdata(dev); @@ -447,7 +447,7 @@ static int s3c_rtc_remove(struct platfor return 0; } -static int s3c_rtc_probe(struct platform_device *pdev) +static int __devinit s3c_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; struct resource *res; @@ -560,7 +560,7 @@ static int s3c_rtc_resume(struct platfor static struct platform_driver s3c2410_rtcdrv = { .probe = s3c_rtc_probe, - .remove = s3c_rtc_remove, + .remove = __devexit_p(s3c_rtc_remove), .suspend = s3c_rtc_suspend, .resume = s3c_rtc_resume, .driver = { _ Patches currently in -mm which might be from ben-linux@xxxxxxxxx are origin.patch linux-next.patch parport-fix-platform-driver-hotplug-coldplug.patch sm501-add-power-control-callback.patch sm501-add-gpiolib-support.patch sm501-gpio-dynamic-registration-for-pci-devices.patch sm501-gpio-i2c-support.patch sm501-fixes-for-akpms-comments-on-gpiolib-addition.patch mfd-sm501-build-fixes-when-config_mfd_sm501_gpio-unset.patch mfd-sm501-fix-gpio-number-calculation-for-upper-bank.patch rtc-rtc-s3c-add-__devexit-and-__devinit-markers.patch rtc-rtc-s3c-update-irq-handling.patch sm501-add-inversion-controls-for-vbiasen-and-fpen.patch sm501-restructure-init-to-allow-only-1-fb-on-an-sm501.patch sm501-fixup-allocation-code-to-be-64bit-resource-compliant.patch sm501-fixup-allocation-code-to-be-64bit-resource-compliant-sm501-align-panel-fb-to-page_size.patch sm501-fixup-allocation-code-to-be-64bit-resource-compliant-sm501-align-panel-fb-to-page_size-fix.patch fb-add-support-for-the-ili9320-video-display-controller.patch fb-add-support-for-the-ili9320-video-display-controller-fix.patch lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops.patch lcd-add-platform_lcd-driver.patch lcd-add-platform_lcd-driver-fix.patch lcd-add-platform_lcd-driver-fb-fix-platform_lcd-match-entry.patch resource-add-resource_size.patch resource-add-resource_type-and-ioresource_type_bits.patch resource-add-new-ioresource_clk-type-v2.patch i2c-sh_mobile-ioresource_clk-support.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html