diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-01 17:35:46 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-01 17:35:46 -0500 |
| commit | 00075ce10102d5754d13159157f4892d5a2a40e5 (patch) | |
| tree | b22fc380e02632afbe82ec27e163f86dac304404 | |
| parent | 1fed0cde21956d6d100b2734cfe3bba88786dbbd (diff) | |
Misc merge changes
Changes to be committed:
modified: drivers/media/video/mxc/capture/mx27_v4l2_capture.c
modified: drivers/media/video/mxc/output/mx27_v4l2_output.c
modified: drivers/mmc/host/mxc_mmc.c
modified: drivers/spi/mxc_spi.c
modified: drivers/usb/gadget/arcotg_udc.c
| -rw-r--r-- | drivers/media/video/mxc/capture/mx27_v4l2_capture.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/mxc/output/mx27_v4l2_output.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mxc_mmc.c | 2 | ||||
| -rw-r--r-- | drivers/spi/mxc_spi.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/arcotg_udc.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c index 7d92fbfaa333..155cd5e6626b 100644 --- a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c @@ -1875,7 +1875,6 @@ static struct video_device mxc_v4l_template = { .name = "Mxc Camera", .type = 0, .type2 = VID_TYPE_CAPTURE, - .hardware = 0, .fops = &mxc_v4l_fops, .release = video_device_release, }; diff --git a/drivers/media/video/mxc/output/mx27_v4l2_output.c b/drivers/media/video/mxc/output/mx27_v4l2_output.c index 9e26bfb85af7..13dbf2ef2030 100644 --- a/drivers/media/video/mxc/output/mx27_v4l2_output.c +++ b/drivers/media/video/mxc/output/mx27_v4l2_output.c @@ -1334,7 +1334,7 @@ static struct video_device mxc_v4l2out_template = { .name = "MXC Video Output", .type = 0, .type2 = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING, - .hardware = 39, + // DLS .hardware = 39, .fops = &mxc_v4l2out_fops, .release = video_device_release, }; diff --git a/drivers/mmc/host/mxc_mmc.c b/drivers/mmc/host/mxc_mmc.c index dd118cc1bb99..fde2db43ba9c 100644 --- a/drivers/mmc/host/mxc_mmc.c +++ b/drivers/mmc/host/mxc_mmc.c @@ -630,7 +630,7 @@ static int mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) #endif /* Use PIO tranfer of data */ buf = - (unsigned long *)(page_address(data->sg->page) + data->sg->offset); + (unsigned long *)(sg_virt(data->sg)); buf8 = (u8 *) buf; /* calculate the number of bytes requested for transfer */ diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index 309b61f90ee0..a32a583f2a06 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -786,13 +786,13 @@ static int spi_bitbang_suspend(struct spi_bitbang *bitbang) while (!list_empty(&bitbang->queue) && limit--) { spin_unlock_irqrestore(&bitbang->lock, flags); - dev_dbg(bitbang->master->cdev.dev, "wait for queue\n"); + dev_dbg(bitbang->master->dev.parent, "wait for queue\n"); msleep(10); spin_lock_irqsave(&bitbang->lock, flags); } if (!list_empty(&bitbang->queue)) { - dev_err(bitbang->master->cdev.dev, "queue didn't empty\n"); + dev_err(bitbang->master->dev.parent, "queue didn't empty\n"); return -EBUSY; } spin_unlock_irqrestore(&bitbang->lock, flags); diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index ef4866136001..27dc8ee38c64 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -43,7 +43,7 @@ #include <linux/mm.h> #include <linux/platform_device.h> #include <linux/usb/ch9.h> -#include <linux/usb_gadget.h> +#include <linux/usb/gadget.h> #include <linux/dma-mapping.h> #include <linux/dmapool.h> #include <linux/fsl_devices.h> |