diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/core.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_s3c.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 6 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index ccc5c262ac..7bc0a0f04c 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -119,7 +119,9 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf) int ret = 0; struct mtd_info *mtd = cdev->priv; struct mtd_info_user *user = buf; +#if (defined(CONFIG_NAND_ECC_HW) || defined(CONFIG_NAND_ECC_SOFT)) struct mtd_ecc_stats *ecc = buf; +#endif struct region_info_user *reg = buf; switch (request) { diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index a5fd4eeb52..2bdc1df696 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -153,7 +153,7 @@ static int s3c_serial_probe(struct device_d *dev) struct s3c_uart *priv; struct console_device *cdev; - priv = xzalloc(sizeof(struct console_device)); + priv = xzalloc(sizeof(struct s3c_uart)); cdev = &priv->cdev; priv->regs = dev_request_mem_region(dev, 0); dev->priv = priv; diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 56525559f6..87dcfac965 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1260,7 +1260,7 @@ static void pxa27x_change_configuration(struct pxa_udc *udc, int config) udc->driver->setup(&udc->gadget, &req); } -static void pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt) +static void __maybe_unused pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt) { struct usb_ctrlrequest req; @@ -1473,9 +1473,9 @@ static struct pxa_udc memory = { } }; -static int pxa27x_udc_poller(struct poller_struct *poller) +static void pxa27x_udc_poller(struct poller_struct *poller) { - return usb_gadget_poll(); + usb_gadget_poll(); } static struct poller_struct poller = { .func = pxa27x_udc_poller diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 509ba640e3..519cdbf25a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -37,7 +37,7 @@ config DRIVER_VIDEO_S3C24XX help Add support for the S3C244x LCD controller. -if DRIVER_VIDEO_S3C +if DRIVER_VIDEO_S3C24XX config DRIVER_VIDEO_S3C_VERBOSE bool "S3C244x verbose framebuffer info" |