summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/devs.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-30 06:49:38 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-30 06:49:38 +0200
commite9dd2561793c05d70c9df1bc16a2dde6f23388df (patch)
tree20099972569cc0748133a6351600fff9cbb15f4a /arch/arm/mach-s3c2410/devs.c
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6. (diff)
downloadlinux-e9dd2561793c05d70c9df1bc16a2dde6f23388df.tar.xz
linux-e9dd2561793c05d70c9df1bc16a2dde6f23388df.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'arch/arm/mach-s3c2410/devs.c')
-rw-r--r--arch/arm/mach-s3c2410/devs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 64792f678668..4664bd11adc1 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -96,8 +96,8 @@ struct platform_device s3c_device_lcd = {
.num_resources = ARRAY_SIZE(s3c_lcd_resource),
.resource = s3c_lcd_resource,
.dev = {
- .dma_mask = &s3c_device_lcd_dmamask,
- .coherent_dma_mask = 0xffffffffUL
+ .dma_mask = &s3c_device_lcd_dmamask,
+ .coherent_dma_mask = 0xffffffffUL
}
};