diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
| commit | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (patch) | |
| tree | 9217bee214128a4a45b2e0a3d9784d05fea2c8fb /arch/arm/mach-s3c2410/devs.c | |
| parent | 164cad9bacc2cf190493d2ee4918dc2869ba6f53 (diff) | |
| parent | da41119af78864d27ccbf505949df788d5e8aaf5 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/devs.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/devs.c | 4 |
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 = { | |||
| 96 | .num_resources = ARRAY_SIZE(s3c_lcd_resource), | 96 | .num_resources = ARRAY_SIZE(s3c_lcd_resource), |
| 97 | .resource = s3c_lcd_resource, | 97 | .resource = s3c_lcd_resource, |
| 98 | .dev = { | 98 | .dev = { |
| 99 | .dma_mask = &s3c_device_lcd_dmamask, | 99 | .dma_mask = &s3c_device_lcd_dmamask, |
| 100 | .coherent_dma_mask = 0xffffffffUL | 100 | .coherent_dma_mask = 0xffffffffUL |
| 101 | } | 101 | } |
| 102 | }; | 102 | }; |
| 103 | 103 | ||