diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/amba/bus.c | 3 | ||||
| -rw-r--r-- | drivers/input/mouse/pxa930_trkball.c | 4 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/amba-clcd.c | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 6b94fb7be5f..00c46e0b40e 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -12,9 +12,10 @@ #include <linux/device.h> #include <linux/string.h> #include <linux/slab.h> +#include <linux/io.h> #include <linux/amba/bus.h> -#include <asm/io.h> +#include <asm/irq.h> #include <asm/sizes.h> #define to_amba_device(d) container_of(d, struct amba_device, dev) diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c index a0f45c4fc19..d297accf9a7 100644 --- a/drivers/input/mouse/pxa930_trkball.c +++ b/drivers/input/mouse/pxa930_trkball.c @@ -186,7 +186,7 @@ static int __devinit pxa930_trkball_probe(struct platform_device *pdev) error = request_irq(irq, pxa930_trkball_interrupt, IRQF_DISABLED, pdev->name, trkball); if (error) { - dev_err(&pdev->dev, "failed to request irq: %d\n", ret); + dev_err(&pdev->dev, "failed to request irq: %d\n", error); goto failed_free_io; } @@ -227,7 +227,7 @@ failed_free_io: iounmap(trkball->mmio_base); failed: kfree(trkball); - return ret; + return error; } static int __devexit pxa930_trkball_remove(struct platform_device *pdev) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 64fcf8c2082..3e525e38a5d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -457,7 +457,7 @@ config SERIAL_SAMSUNG config SERIAL_SAMSUNG_UARTS int - depends on SERIAL_SAMSUNG + depends on ARM && PLAT_S3C default 2 if ARCH_S3C2400 default 4 if ARCH_S3C64XX || CPU_S3C2443 default 3 diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 2ac52fd8cc1..4e046fed138 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c @@ -24,6 +24,7 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/clk.h> +#include <linux/hardirq.h> #include <asm/sizes.h> |