Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

This commit is contained in:
Russell King
2008-11-29 19:35:07 +00:00
committed by Russell King
39 changed files with 41 additions and 41 deletions

View File

@ -26,7 +26,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/plat-s3c/regs-rtc.h>
#include <plat/regs-rtc.h>
/* I have yet to find an S3C implementation with more than one
* of these rtc blocks in */