diff options
author | David S. Miller <davem@davemloft.net> | 2016-10-14 17:00:27 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-14 17:00:27 +0300 |
commit | 8eed1cd4cd0c6f41d40c345265f20dc7688ffcca (patch) | |
tree | 5adaacccdc1e519e3861b8f7333f39350205a472 /drivers/video/fbdev/s3c2410fb.c | |
parent | 687d911466774808ed4926edadb20cc4f0153bed (diff) | |
parent | 29fbff8698fc0ac1a1d74584b258e0bf18b469f9 (diff) | |
download | linux-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/video/fbdev/s3c2410fb.c')
-rw-r--r-- | drivers/video/fbdev/s3c2410fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/s3c2410fb.c b/drivers/video/fbdev/s3c2410fb.c index 0dd86be36afb..a67e4567e656 100644 --- a/drivers/video/fbdev/s3c2410fb.c +++ b/drivers/video/fbdev/s3c2410fb.c @@ -767,7 +767,7 @@ static irqreturn_t s3c2410fb_irq(int irq, void *dev_id) return IRQ_HANDLED; } -#ifdef CONFIG_CPU_FREQ +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ static int s3c2410fb_cpufreq_transition(struct notifier_block *nb, unsigned long val, void *data) |