From 444c54db0015fb02222d0ae0d1a0b4f18f8e7516 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Sat, 10 May 2008 00:08:12 +0800
Subject: [PATCH] --- yaml --- r: 96335 b: refs/heads/master c:
 e4f7c0bf1f2e8a1b184a33ab60e874391d70f86c h: refs/heads/master i:   96333:
 2d518b76c4d21f36f5089a9e6a63a5d78612e5ab   96331:
 45a511891e8be8d98c5326245fdfc2787663046c   96327:
 f5f6361a9fa1482a8caf591d38af8a826d985db8   96319:
 efa4e8a944fd6bb2853ff6724a42ffcf85689b98 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5d8f494572db..78f58ef7f3d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b964c592d42a7146a0b157147432da882abd3404
+refs/heads/master: e4f7c0bf1f2e8a1b184a33ab60e874391d70f86c
diff --git a/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c b/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 40504eeadec9..3b74f96d3590 100644
--- a/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -36,7 +36,9 @@
 #include <linux/spi/flash.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
 #include <linux/usb/musb.h>
+#endif
 #include <asm/bfin5xx_spi.h>
 #include <asm/cplb.h>
 #include <asm/dma.h>