From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anatolij Gustschin Date: Mon, 30 Apr 2012 16:51:43 +0200 Subject: [U-Boot] [PATCH v3 4/4] lin_gadget: use common linux/compat.h In-Reply-To: <1335443684-11433-1-git-send-email-agust@denx.de> References: <1335341501-4270-1-git-send-email-agust@denx.de> <1335443684-11433-1-git-send-email-agust@denx.de> Message-ID: <20120430165143.47fe6ee3@wker> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, 26 Apr 2012 14:34:44 +0200 Anatolij Gustschin wrote: > From: Mike Frysinger > > Merge our duplicate definitions with the common header. > > Also fix drivers/usb/gadget/s3c_udc_otg_xfer_dma.c to > use min() instead of min_t() since we remove the latter > from compat.h. > > Additionally use memalign() directly as the lin_gadget > specific kmalloc() macro is removed from lin_gadget_compat.h > by this patch. > > Signed-off-by: Mike Frysinger > Signed-off-by: Anatolij Gustschin > Cc: Lukasz Majewski > --- > v3: > - use memalign() in the s3c_udc_otg driver directly > > v2: > - fix build breakage: > In file included from s3c_udc_otg.c:212:0: > s3c_udc_otg_xfer_dma.c: In function 'setdma_tx': > s3c_udc_otg_xfer_dma.c:171:47: error: macro "min_t" requires 3 arguments, but only 2 given > s3c_udc_otg_xfer_dma.c:171:12: error: 'min_t' undeclared (first use in this function) > > drivers/usb/gadget/s3c_udc_otg.c | 5 +++-- > drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 2 +- > include/linux/compat.h | 3 +++ > include/usb/lin_gadget_compat.h | 15 ++------------- > 4 files changed, 9 insertions(+), 16 deletions(-) Applied to u-boot-staging/agust at denx.de. Thanks! Anatolij