aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/devs.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
committerSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
commitfd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch)
tree5886a08bfa1132058b06074f4666a36dc5ddd2a1 /arch/arm/mach-s3c2410/devs.c
parent88274815f7477dc7550439413ab87c5ce4c5a623 (diff)
parent7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/arm/mach-s3c2410/devs.c')
-rw-r--r--arch/arm/mach-s3c2410/devs.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 0a47d38789a5..ca09ba516e4c 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -334,11 +334,17 @@ static struct resource s3c_spi0_resource[] = {
334 334
335}; 335};
336 336
337static u64 s3c_device_spi0_dmamask = 0xffffffffUL;
338
337struct platform_device s3c_device_spi0 = { 339struct platform_device s3c_device_spi0 = {
338 .name = "s3c2410-spi", 340 .name = "s3c2410-spi",
339 .id = 0, 341 .id = 0,
340 .num_resources = ARRAY_SIZE(s3c_spi0_resource), 342 .num_resources = ARRAY_SIZE(s3c_spi0_resource),
341 .resource = s3c_spi0_resource, 343 .resource = s3c_spi0_resource,
344 .dev = {
345 .dma_mask = &s3c_device_spi0_dmamask,
346 .coherent_dma_mask = 0xffffffffUL
347 }
342}; 348};
343 349
344EXPORT_SYMBOL(s3c_device_spi0); 350EXPORT_SYMBOL(s3c_device_spi0);
@@ -359,11 +365,17 @@ static struct resource s3c_spi1_resource[] = {
359 365
360}; 366};
361 367
368static u64 s3c_device_spi1_dmamask = 0xffffffffUL;
369
362struct platform_device s3c_device_spi1 = { 370struct platform_device s3c_device_spi1 = {
363 .name = "s3c2410-spi", 371 .name = "s3c2410-spi",
364 .id = 1, 372 .id = 1,
365 .num_resources = ARRAY_SIZE(s3c_spi1_resource), 373 .num_resources = ARRAY_SIZE(s3c_spi1_resource),
366 .resource = s3c_spi1_resource, 374 .resource = s3c_spi1_resource,
375 .dev = {
376 .dma_mask = &s3c_device_spi1_dmamask,
377 .coherent_dma_mask = 0xffffffffUL
378 }
367}; 379};
368 380
369EXPORT_SYMBOL(s3c_device_spi1); 381EXPORT_SYMBOL(s3c_device_spi1);