diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-01 11:28:32 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-01 11:28:32 +0200 | 
| commit | ffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af (patch) | |
| tree | 206908754219b5cc6e9f03518d34fb95a247bef9 /cpu/mpc5xxx/usb_ohci.c | |
| parent | ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55 (diff) | |
| parent | fd03ea89641d6f6ade6d1a8580c1bb9f52b8542c (diff) | |
| download | olio-uboot-2014.01-ffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af.tar.xz olio-uboot-2014.01-ffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af.zip | |
Merge branch 'next'
Diffstat (limited to 'cpu/mpc5xxx/usb_ohci.c')
| -rw-r--r-- | cpu/mpc5xxx/usb_ohci.c | 7 | 
1 files changed, 0 insertions, 7 deletions
| diff --git a/cpu/mpc5xxx/usb_ohci.c b/cpu/mpc5xxx/usb_ohci.c index 66a4af8d8..7976e4df7 100644 --- a/cpu/mpc5xxx/usb_ohci.c +++ b/cpu/mpc5xxx/usb_ohci.c @@ -76,13 +76,8 @@  #define m16_swap(x) swap_16(x)  #define m32_swap(x) swap_32(x) -#ifdef CONFIG_MPC5200  #define ohci_cpu_to_le16(x) (x)  #define ohci_cpu_to_le32(x) (x) -#else -#define ohci_cpu_to_le16(x) swap_16(x) -#define ohci_cpu_to_le32(x) swap_32(x) -#endif  /* global ohci_t */  static ohci_t gohci; @@ -803,9 +798,7 @@ static td_t * dl_reverse_done_list (ohci_t *ohci)  				} else  					td_list->ed->hwHeadP &= ohci_cpu_to_le32 (0xfffffff2);  			} -#ifdef CONFIG_MPC5200  			td_list->hwNextTD = 0; -#endif  		}  		td_list->next_dl_td = td_rev; |