Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28375
b: refs/heads/master
c: dfbaa7d
h: refs/heads/master
i:
  28373: 1bd6c42
  28371: aede349
  28367: 92cb295
v: v3
  • Loading branch information
Ralf Baechle authored and Greg Kroah-Hartman committed Jun 21, 2006
1 parent e868049 commit 9de6c9a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bfd5df3c0cf65bdf10a3a00baff036cb096140f6
refs/heads/master: dfbaa7d8a4056436b6a170625d64986ebb648486
4 changes: 0 additions & 4 deletions trunk/drivers/usb/host/ehci-au1xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
#include <linux/platform_device.h>
#include <asm/mach-au1x00/au1000.h>

#ifndef CONFIG_SOC_AU1200
#error "this Alchemy chip doesn't have EHCI"
#else /* Au1200 */

#define USB_HOST_CONFIG (USB_MSR_BASE + USB_MSR_MCFG)
#define USB_MCFG_PFEN (1<<31)
#define USB_MCFG_RDCOMB (1<<30)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/ehci-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_fsl_driver
#endif

#ifdef CONFIG_SOC_AU1X00
#ifdef CONFIG_SOC_AU1200
#include "ehci-au1xxx.c"
#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
#endif
Expand Down

0 comments on commit 9de6c9a

Please sign in to comment.