linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [ARM] pxa/regs-u2d: add missing new line.
@ 2010-04-07  8:40 Igor Grinberg
  2010-04-07  8:50 ` Eric Miao
  0 siblings, 1 reply; 5+ messages in thread
From: Igor Grinberg @ 2010-04-07  8:40 UTC (permalink / raw)
  To: linux-arm-kernel


Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-pxa/include/mach/regs-u2d.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/include/mach/regs-u2d.h b/arch/arm/mach-pxa/include/mach/regs-u2d.h
index 44b0b20..c15c0c5 100644
--- a/arch/arm/mach-pxa/include/mach/regs-u2d.h
+++ b/arch/arm/mach-pxa/include/mach/regs-u2d.h
@@ -166,7 +166,8 @@
 #define U2DMACSR_BUSERRTYPE	(7 << 10)	/* PX Bus Error Type */
 #define U2DMACSR_EORINTR	(1 << 9)	/* End Of Receive */
 #define U2DMACSR_REQPEND	(1 << 8)	/* Request Pending */
-#define U2DMACSR_RASINTR	(1 << 4)	/* Request After Channel Stopped (read / write 1 clear) */#define U2DMACSR_STOPINTR	(1 << 3)	/* Stop Interrupt (read only) */
+#define U2DMACSR_RASINTR	(1 << 4)	/* Request After Channel Stopped (read / write 1 clear) */
+#define U2DMACSR_STOPINTR	(1 << 3)	/* Stop Interrupt (read only) */
 #define U2DMACSR_ENDINTR	(1 << 2)	/* End Interrupt (read / write 1 clear) */
 #define U2DMACSR_STARTINTR	(1 << 1)	/* Start Interrupt (read / write 1 clear) */
 #define U2DMACSR_BUSERRINTR	(1 << 0)	/* Bus Error Interrupt (read / write 1 clear) */
-- 
1.6.4.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH] [ARM] pxa/regs-u2d: add missing new line.
  2010-04-07  8:40 [PATCH] [ARM] pxa/regs-u2d: add missing new line Igor Grinberg
@ 2010-04-07  8:50 ` Eric Miao
  2010-04-27 15:16   ` Igor Grinberg
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Miao @ 2010-04-07  8:50 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Apr 7, 2010 at 4:40 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>

Applied to 'fix'.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] [ARM] pxa/regs-u2d: add missing new line.
  2010-04-07  8:50 ` Eric Miao
@ 2010-04-27 15:16   ` Igor Grinberg
  2010-04-28  2:28     ` Eric Miao
  0 siblings, 1 reply; 5+ messages in thread
From: Igor Grinberg @ 2010-04-27 15:16 UTC (permalink / raw)
  To: linux-arm-kernel

On 04/07/10 11:50, Eric Miao wrote:
> On Wed, Apr 7, 2010 at 4:40 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>   
>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>>     
> Applied to 'fix'.
>   
I can't see it at
http://git.kernel.org/?p=linux/kernel/git/ycmiao/pxa-linux-2.6.git;a=shortlog;h=refs/heads/fix
Can you, please, update your git tree?

Thanks,
Igor

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] [ARM] pxa/regs-u2d: add missing new line.
  2010-04-27 15:16   ` Igor Grinberg
@ 2010-04-28  2:28     ` Eric Miao
  2010-04-28  6:03       ` Igor Grinberg
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Miao @ 2010-04-28  2:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Apr 27, 2010 at 11:16 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
> On 04/07/10 11:50, Eric Miao wrote:
>> On Wed, Apr 7, 2010 at 4:40 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>>
>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>>>
>> Applied to 'fix'.
>>
> I can't see it at
> http://git.kernel.org/?p=linux/kernel/git/ycmiao/pxa-linux-2.6.git;a=shortlog;h=refs/heads/fix
> Can you, please, update your git tree?
>

I'm going to push the devel branch early this time, and to avoid the dependency
latency, I'd like to move this patch into -devel if you don't mind. Please check
-devel instead.

Thanks

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] [ARM] pxa/regs-u2d: add missing new line.
  2010-04-28  2:28     ` Eric Miao
@ 2010-04-28  6:03       ` Igor Grinberg
  0 siblings, 0 replies; 5+ messages in thread
From: Igor Grinberg @ 2010-04-28  6:03 UTC (permalink / raw)
  To: linux-arm-kernel



On 04/28/10 05:28, Eric Miao wrote:
> On Tue, Apr 27, 2010 at 11:16 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>   
>> On 04/07/10 11:50, Eric Miao wrote:
>>     
>>> On Wed, Apr 7, 2010 at 4:40 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>>>
>>>       
>>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>>>>
>>>>         
>>> Applied to 'fix'.
>>>
>>>       
>> I can't see it at
>> http://git.kernel.org/?p=linux/kernel/git/ycmiao/pxa-linux-2.6.git;a=shortlog;h=refs/heads/fix
>> Can you, please, update your git tree?
>>
>>     
> I'm going to push the devel branch early this time, and to avoid the dependency
> latency, I'd like to move this patch into -devel if you don't mind. Please check
> -devel instead.
>
> Thanks
>   
I don't mind at all, as long as it makes to mainline.

Thanks,
Igor

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-04-28  6:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-07  8:40 [PATCH] [ARM] pxa/regs-u2d: add missing new line Igor Grinberg
2010-04-07  8:50 ` Eric Miao
2010-04-27 15:16   ` Igor Grinberg
2010-04-28  2:28     ` Eric Miao
2010-04-28  6:03       ` Igor Grinberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).