diff options
| author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-11-19 17:11:04 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:04 +0000 |
| commit | a610c47f0745c82e934f3859a3bea7dc7649cf1f (patch) | |
| tree | 8a657b2a18c4ad3feaf5dd036ab88526add5943d /drivers | |
| parent | 75f1d376da807a9b4ca218527ce7d5ea4d78a931 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 1 | ||||
| -rw-r--r-- | drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 2 |
2 files changed, 1 insertions, 2 deletions
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> |