mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
commit
334d0dd8b6
2168 changed files with 143650 additions and 45097 deletions
|
|
@ -1483,7 +1483,7 @@ static void udc_disable(struct pxa2xx_udc *dev)
|
|||
|
||||
#ifdef CONFIG_ARCH_PXA
|
||||
/* Disable clock for USB device */
|
||||
pxa_set_cken(CKEN11_USB, 0);
|
||||
pxa_set_cken(CKEN_USB, 0);
|
||||
#endif
|
||||
|
||||
ep0_idle (dev);
|
||||
|
|
@ -1529,7 +1529,7 @@ static void udc_enable (struct pxa2xx_udc *dev)
|
|||
|
||||
#ifdef CONFIG_ARCH_PXA
|
||||
/* Enable clock for USB device */
|
||||
pxa_set_cken(CKEN11_USB, 1);
|
||||
pxa_set_cken(CKEN_USB, 1);
|
||||
udelay(5);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -73,13 +73,6 @@ static const struct hc_driver ps3_ehci_hc_driver = {
|
|||
#endif
|
||||
};
|
||||
|
||||
#if !defined(DEBUG)
|
||||
#undef dev_dbg
|
||||
static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
|
||||
const struct device *_dev, const char *fmt, ...) {return 0;}
|
||||
#endif
|
||||
|
||||
|
||||
static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
|
||||
{
|
||||
int result;
|
||||
|
|
|
|||
|
|
@ -75,14 +75,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
|
|||
#endif
|
||||
};
|
||||
|
||||
/* redefine dev_dbg to do a syntax check */
|
||||
|
||||
#if !defined(DEBUG)
|
||||
#undef dev_dbg
|
||||
static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
|
||||
const struct device *_dev, const char *fmt, ...) {return 0;}
|
||||
#endif
|
||||
|
||||
static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
|
||||
{
|
||||
int result;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ static int pxa27x_start_hc(struct device *dev)
|
|||
|
||||
inf = dev->platform_data;
|
||||
|
||||
pxa_set_cken(CKEN10_USBHOST, 1);
|
||||
pxa_set_cken(CKEN_USBHOST, 1);
|
||||
|
||||
UHCHR |= UHCHR_FHR;
|
||||
udelay(11);
|
||||
|
|
@ -123,7 +123,7 @@ static void pxa27x_stop_hc(struct device *dev)
|
|||
UHCCOMS |= 1;
|
||||
udelay(10);
|
||||
|
||||
pxa_set_cken(CKEN10_USBHOST, 0);
|
||||
pxa_set_cken(CKEN_USBHOST, 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@
|
|||
#include <linux/usb.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/wait.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue