diff for duplicates of <20080815131708.GO16231@frodo> diff --git a/a/1.txt b/N1/1.txt index 7a51743..66fc5b1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ architectures when we find out they provide read/write friends. === cut here === From ee8f7e4150e54139613208043561be557f35e3b3 Mon Sep 17 00:00:00 2001 -From: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> +From: Felipe Balbi <felipe.balbi@nokia.com> Date: Fri, 15 Aug 2008 10:51:56 +0300 Subject: [PATCH] musb: io: only define read/write stubs if they're not defined yet @@ -17,7 +17,7 @@ For those archs which don't provide read/write friends we provide our own implementation so musb driver won't break compilation. -Signed-off-by: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> +Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> --- drivers/usb/musb/musb_io.h | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) @@ -55,3 +55,12 @@ index 6bbedae..222f5ab 100644 +#ifndef writesb static inline void writesb(const void __iomem *addr, const void *buf, int len) { outsb((unsigned long)addr, buf, len); } +- + #endif + + /* NOTE: these offsets are all in bytes */ +-- +1.6.0.rc3.6.ga0653 + +-- +balbi diff --git a/a/content_digest b/N1/content_digest index 8619741..300acc8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,15 +8,15 @@ "ref\020080815021131.dfab416a.akpm@linux-foundation.org\0" "ref\020080815115308.GA24513@flint.arm.linux.org.uk\0" "ref\020080815123848.GN16231@frodo\0" - "From\0Felipe Balbi <me-uiRdBs8odbtmTBlB0Cgj/Q@public.gmane.org>\0" + "From\0Felipe Balbi <me@felipebalbi.com>\0" "Subject\0Re: drivers/usb/musb/musb_io.h\0" "Date\0Fri, 15 Aug 2008 16:17:09 +0300\0" - "To\0Felipe Balbi <me-uiRdBs8odbtmTBlB0Cgj/Q@public.gmane.org>\0" - "Cc\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>" - Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org> - linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>\0" + "To\0Felipe Balbi <me@felipebalbi.com>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Felipe Balbi <felipe.balbi@nokia.com> + linux-usb@vger.kernel.org + linux-arch@vger.kernel.org + " Paul Mundt <lethal@linux-sh.org>\0" "\00:1\0" "b\0" "On Fri, Aug 15, 2008 at 03:38:49PM +0300, Felipe Balbi wrote:\n" @@ -30,7 +30,7 @@ "=== cut here ===\n" "\n" "From ee8f7e4150e54139613208043561be557f35e3b3 Mon Sep 17 00:00:00 2001\n" - "From: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\n" + "From: Felipe Balbi <felipe.balbi@nokia.com>\n" "Date: Fri, 15 Aug 2008 10:51:56 +0300\n" "Subject: [PATCH] musb: io: only define read/write stubs if they're not defined yet\n" "\n" @@ -38,7 +38,7 @@ "provide our own implementation so musb driver won't break\n" "compilation.\n" "\n" - "Signed-off-by: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>\n" + "Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>\n" "---\n" " drivers/usb/musb/musb_io.h | 13 +++++++++++--\n" " 1 files changed, 11 insertions(+), 2 deletions(-)\n" @@ -75,6 +75,15 @@ "+#endif\n" "+#ifndef writesb\n" " static inline void writesb(const void __iomem *addr, const void *buf, int len)\n" - " \t{ outsb((unsigned long)addr, buf, len); }" + " \t{ outsb((unsigned long)addr, buf, len); }\n" + "-\n" + " #endif\n" + " \n" + " /* NOTE: these offsets are all in bytes */\n" + "-- \n" + "1.6.0.rc3.6.ga0653\n" + "\n" + "-- \n" + balbi -55044b4667b43e52de10f3d2e2ec4eaf85f12340f60ab832a88b1727187c5c73 +bbc7716f4f9756992d70b75e8098e520dc19f89ce98b97232f5a55e22cef8228
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox