diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:54:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:54:17 +0100 |
| commit | 7dda0c3759c6ee190d44b8ceaeab58047cb9a957 (patch) | |
| tree | 0f57973c1ee7fa4344e07cf271fe16d2616b82f4 /include | |
| parent | dbe20fc79736d4f99a9bfaafeae600c9348504df (diff) | |
| parent | 79f49120ba481ed736face73ecf11a6c1070a861 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx:
powerpc/8xxx:Add MPH controller support in USB device-tree fixup
powerpc/8xxx: Cleanup USB device-tree fixup
Diffstat (limited to 'include')
| -rw-r--r-- | include/fdt_support.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h index cef3c6509d..4b9f84a24a 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -61,11 +61,11 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, const void *val, int len, int create); void fdt_fixup_qe_firmware(void *fdt); -#ifdef CONFIG_HAS_FSL_DR_USB +#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) void fdt_fixup_dr_usb(void *blob, bd_t *bd); #else static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} -#endif /* CONFIG_HAS_FSL_DR_USB */ +#endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */ #if defined(CONFIG_SYS_FSL_SEC_COMPAT) void fdt_fixup_crypto_node(void *blob, int sec_rev); |