summaryrefslogtreecommitdiff
path: root/drivers/usb/usbdcore_mpc8xx.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-05 00:24:32 +0100
committerWolfgang Denk <wd@denx.de>2008-12-05 00:24:32 +0100
commit26f6a2b7f3d215a0bd291e8b37be5a359878037c (patch)
tree5e890a3cb4b36ab9c64cb1f103f268fcdf46bbdd /drivers/usb/usbdcore_mpc8xx.c
parent762bd90cbb6536d2c8451c13fe23552f3311f860 (diff)
parent3c2c2f427905040c1513d0c51d637689cba48346 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/usbdcore_mpc8xx.c')
-rw-r--r--drivers/usb/usbdcore_mpc8xx.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/usbdcore_mpc8xx.c b/drivers/usb/usbdcore_mpc8xx.c
index 53bde0dca3..0e311ada15 100644
--- a/drivers/usb/usbdcore_mpc8xx.c
+++ b/drivers/usb/usbdcore_mpc8xx.c
@@ -58,8 +58,6 @@
*/
#include <common.h>
#include <config.h>
-
-#if defined(CONFIG_MPC885_FAMILY) && defined(CONFIG_USB_DEVICE)
#include <commproc.h>
#include "usbdcore.h"
#include "usbdcore_mpc8xx.h"
@@ -1398,5 +1396,3 @@ static u32 mpc8xx_udc_alloc (u32 data_size, u32 alignment)
return retaddr;
}
-
-#endif /* CONFIG_MPC885_FAMILY && CONFIG_USB_DEVICE) */