diff options
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/adc.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/map.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/irq.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 20fbf936bb93..342647eb91d8 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # arch/arm/plat-s3c24xx/Kconfig | ||
2 | # | ||
3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
4 | # | 2 | # |
5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c index df47322492d5..ce47627f3368 100644 --- a/arch/arm/plat-s3c24xx/adc.c +++ b/arch/arm/plat-s3c24xx/adc.c | |||
@@ -365,7 +365,7 @@ static int s3c_adc_probe(struct platform_device *pdev) | |||
365 | return ret; | 365 | return ret; |
366 | } | 366 | } |
367 | 367 | ||
368 | static int s3c_adc_remove(struct platform_device *pdev) | 368 | static int __devexit s3c_adc_remove(struct platform_device *pdev) |
369 | { | 369 | { |
370 | struct adc_device *adc = platform_get_drvdata(pdev); | 370 | struct adc_device *adc = platform_get_drvdata(pdev); |
371 | 371 | ||
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index f65192d5b1d7..f0ea7943ac5a 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -1403,11 +1403,13 @@ static struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel) | |||
1403 | ord = &dma_order->channels[channel]; | 1403 | ord = &dma_order->channels[channel]; |
1404 | 1404 | ||
1405 | for (ch = 0; ch < dma_channels; ch++) { | 1405 | for (ch = 0; ch < dma_channels; ch++) { |
1406 | int tmp; | ||
1406 | if (!is_channel_valid(ord->list[ch])) | 1407 | if (!is_channel_valid(ord->list[ch])) |
1407 | continue; | 1408 | continue; |
1408 | 1409 | ||
1409 | if (s3c2410_chans[ord->list[ch]].in_use == 0) { | 1410 | tmp = ord->list[ch] & ~DMA_CH_VALID; |
1410 | ch = ord->list[ch] & ~DMA_CH_VALID; | 1411 | if (s3c2410_chans[tmp].in_use == 0) { |
1412 | ch = tmp; | ||
1411 | goto found; | 1413 | goto found; |
1412 | } | 1414 | } |
1413 | } | 1415 | } |
diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h index c4d133436fc7..bd534d32b993 100644 --- a/arch/arm/plat-s3c24xx/include/plat/map.h +++ b/arch/arm/plat-s3c24xx/include/plat/map.h | |||
@@ -64,7 +64,7 @@ | |||
64 | /* the calculation for the VA of this must ensure that | 64 | /* the calculation for the VA of this must ensure that |
65 | * it is the same distance apart from the UART in the | 65 | * it is the same distance apart from the UART in the |
66 | * phsyical address space, as the initial mapping for the IO | 66 | * phsyical address space, as the initial mapping for the IO |
67 | * is done as a 1:1 maping. This puts it (currently) at | 67 | * is done as a 1:1 mapping. This puts it (currently) at |
68 | * 0xFA800000, which is not in the way of any current mapping | 68 | * 0xFA800000, which is not in the way of any current mapping |
69 | * by the base system. | 69 | * by the base system. |
70 | */ | 70 | */ |
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index ef0f521437d7..ad0d44ef1f93 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c | |||
@@ -522,6 +522,8 @@ int s3c24xx_set_fiq(unsigned int irq, bool on) | |||
522 | __raw_writel(intmod, S3C2410_INTMOD); | 522 | __raw_writel(intmod, S3C2410_INTMOD); |
523 | return 0; | 523 | return 0; |
524 | } | 524 | } |
525 | |||
526 | EXPORT_SYMBOL_GPL(s3c24xx_set_fiq); | ||
525 | #endif | 527 | #endif |
526 | 528 | ||
527 | 529 | ||