diff --git a/[refs] b/[refs] index 6a6957d60e42..bd30b7e7ae7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9498cb79463c9b2abb243a4b0c2ce3ac1853d5b0 +refs/heads/master: e2cd00cfebd9a25e0e09712b0116ef18edc2cd98 diff --git a/trunk/include/asm-arm/plat-s3c/regs-rtc.h b/trunk/arch/arm/plat-s3c/include/plat/regs-rtc.h similarity index 100% rename from trunk/include/asm-arm/plat-s3c/regs-rtc.h rename to trunk/arch/arm/plat-s3c/include/plat/regs-rtc.h diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c index 910bc704939c..0273ebc4cf36 100644 --- a/trunk/drivers/rtc/rtc-s3c.c +++ b/trunk/drivers/rtc/rtc-s3c.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include /* I have yet to find an S3C implementation with more than one * of these rtc blocks in */