Messages in this thread Patch in this message | | | From | David Brownell <> | Subject | Re: [PATCH] musb: fix DaVinci build again | Date | Thu, 25 Dec 2008 12:37:44 -0800 |
| |
Greg, I suggest you just use the appended patch to *REPLACE* the patch now in your gregkh-04-usb queue:
usb-musb-build-fixes-for-davinci.patch
Net effect of including this plus the other patches in that queue is to achieve what the original 2.6.27-rc(3?) build fix patch would have done, if it were merged right.
- Dave
=========== From: Kevin Hilman <khilman@deeprootsystems.com>
- update includes after asm/arch --> mach headers move
[ dbrownell@users.sourceforge.net: just fix mismerge of my 2.6.27-rc patch ]
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/usb/musb/davinci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -32,9 +32,9 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <asm/arch/hardware.h> -#include <asm/arch/memory.h> -#include <asm/arch/gpio.h> +#include <mach/hardware.h> +#include <mach/memory.h> + #include <asm/mach-types.h> #include "musb_core.h"
| |