diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-31 12:09:59 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-31 12:09:59 -0500 |
| commit | 189ee18442be3848ac39cd0468fb15f6ffd630ca (patch) | |
| tree | 81e2430d1dc636031f42b755840147f01f0ef873 | |
| parent | 3d67102510d640afd83212882e39d3f6ce1e7b14 (diff) | |
Misc merge error fixes
Changes to be committed:
modified: drivers/mmc/core/Makefile
modified: drivers/mxc/vpu/mxc_vpu.c
modified: drivers/usb/gadget/arcotg_udc.c
| -rw-r--r-- | drivers/mmc/core/Makefile | 4 | ||||
| -rw-r--r-- | drivers/mxc/vpu/mxc_vpu.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/arcotg_udc.c | 46 |
3 files changed, 4 insertions, 52 deletions
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index 3fdd08c7f143..ddd0f907a722 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile @@ -8,5 +8,7 @@ endif obj-$(CONFIG_MMC) += mmc_core.o mmc_core-y := core.o sysfs.o bus.o host.o \ - mmc.o mmc_ops.o sd.o sd_ops.o + mmc.o mmc_ops.o sd.o sd_ops.o \ + sdio.o sdio_ops.o sdio_bus.o \ + sdio_cis.o sdio_io.o sdio_irq.o diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c index b5a7538809a4..b78edea38c87 100644 --- a/drivers/mxc/vpu/mxc_vpu.c +++ b/drivers/mxc/vpu/mxc_vpu.c @@ -497,11 +497,7 @@ static void __exit vpu_exit(void) if (vpu_major > 0) { class_device_destroy(vpu_class, MKDEV(vpu_major, 0)); class_destroy(vpu_class); - if (unregister_chrdev(vpu_major, "mxc_vpu") < 0) { - printk(KERN_ERR - "Failed to unregister vpu from devfs\n"); - return; - } + unregister_chrdev(vpu_major, "mxc_vpu"); vpu_major = 0; } diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 7c3d19c2ee2f..ef4866136001 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -838,49 +838,6 @@ static void arcotg_free_request(struct usb_ep *_ep, struct usb_request *_req) kfree(req); } -/*! - * Allocate an I/O buffer for the ep->req->buf. - * @param _ep endpoint pointer - * @param bytes length of the desired buffer - * @param dma pointer to the buffer's DMA address; must be valid - * when gadget layer calls this function, ma is &req->dma - * @param gfp_flags GFP_* flags to use - * @return Returns a new buffer, or null if one could not be allocated - */ -static void *arcotg_alloc_buffer(struct usb_ep *_ep, unsigned bytes, - dma_addr_t * dma, gfp_t gfp_flags) -{ - void *retval = NULL; - - if (!bytes) - return 0; - - retval = kmalloc(bytes, gfp_flags); - - if (retval) - *dma = virt_to_phys(retval); - - pr_debug("udc: ep=%s buffer=0x%p dma=0x%x len=%d\n", - _ep->name, retval, *dma, bytes); - - return retval; -} - -/*! - * Free an I/O buffer for the ep->req->buf - * @param _ep endpoint pointer - * @param buf data buf pointer - * @param dma for 834x, we will not touch dma field - * @param bytes buffer size - */ -static void arcotg_free_buffer(struct usb_ep *_ep, void *buf, - dma_addr_t dma, unsigned bytes) -{ - pr_debug("udc: buf=0x%p dma=0x%x\n", buf, dma); - if (buf) - kfree(buf); -} - /*-------------------------------------------------------------------------*/ /*! @@ -1346,9 +1303,6 @@ static const struct usb_ep_ops arcotg_ep_ops = { .alloc_request = arcotg_alloc_request, .free_request = arcotg_free_request, - .alloc_buffer = arcotg_alloc_buffer, - .free_buffer = arcotg_free_buffer, - .queue = arcotg_ep_queue, .dequeue = arcotg_ep_dequeue, |