[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <201211270837.48458.arnd@arndb.de>
Date: Tue, 27 Nov 2012 08:37:48 +0000
From: Arnd Bergmann <arnd@...db.de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Olof Johansson <olof@...om.net>,
linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, Andrew Lunn <andrew@...n.ch>,
Jason Cooper <jason@...edaemon.net>,
Bill Pemberton <wfp5p@...ginia.edu>, Greg KH <greg@...ah.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
On Tuesday 27 November 2012, Stephen Rothwell wrote:
> @@@ -167,7 -184,9 +170,9 @@@ ehci_orion_conf_mbus_windows(struct usb
> }
> }
>
> + static u64 ehci_orion_dma_mask = DMA_BIT_MASK(32);
> +
> -static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
> +static int ehci_orion_drv_probe(struct platform_device *pdev)
> {
> struct orion_ehci_data *pd = pdev->dev.platform_data;
> const struct mbus_dram_target_info *dram;
Looks good, thanks!
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists