From a610c47f0745c82e934f3859a3bea7dc7649cf1f Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas.bonn@gmail.com>
Date: Wed, 19 Nov 2008 17:11:04 +0000
Subject: Carry over changes from asm/arch/regs-sdi.h

This pulls the Moko changes to regs-sdi.h that were in
include/asm-arm/arch-s3c2410 over to the file at arch/arm/../mach and
deletes the file at include/asm-arm.

Note: we have been using a mix of regs-sdi.h from the two different
locations.  The unification of these two files may have some unknown
consequences... keep your eyes open for oddities after applying this.

Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
---
 drivers/mmc/host/s3cmci.c              | 1 -
 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'drivers')

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index d12764dfab9..2038c93cfd9 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -32,7 +32,6 @@
 #include <asm/dma-mapping.h>
 
 #include <asm/io.h>
-#include <asm/arch/regs-sdi.h>
 #include <mach/regs-gpio.h>
 #include <mach/mci.h>
 #include <mach/dma.h>
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
index 5942d94d233..f56b85f1c85 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -46,7 +46,7 @@
 #include <asm/dma.h>
 #include <asm/dma-mapping.h>
 
-#include <asm/arch-s3c2410/regs-sdi.h>
+#include <mach/regs-sdi.h>
 #include <mach/regs-gpio.h>
 #include <mach/mci.h>
 #include <mach/gta02.h>
-- 
cgit v1.2.3