diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 17:40:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 17:41:06 -0400 |
| commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
| tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/mach-s3c2440/mach-at2440evb.c | |
| parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
| parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) | |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-at2440evb.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 315c42e31278..dfc7010935da 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -166,7 +166,7 @@ static struct platform_device at2440evb_device_eth = { | |||
| 166 | }; | 166 | }; |
| 167 | 167 | ||
| 168 | static struct s3c24xx_mci_pdata at2440evb_mci_pdata = { | 168 | static struct s3c24xx_mci_pdata at2440evb_mci_pdata = { |
| 169 | .gpio_detect = S3C2410_GPG10, | 169 | .gpio_detect = S3C2410_GPG(10), |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | /* 7" LCD panel */ | 172 | /* 7" LCD panel */ |