Merge branch 'linus' into locking/urgent, to pick up fixes

[linux-2.6-block.git] / drivers / acpi / acpi_cmos_rtc.c

diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f1590111d488216302f475c42b42137..0980a133916fa0781f59f5d470309567a1c23294 100644 (file)
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
 
 #include "internal.h"