From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753351AbZBCGl6 (ORCPT ); Tue, 3 Feb 2009 01:41:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751797AbZBCGls (ORCPT ); Tue, 3 Feb 2009 01:41:48 -0500 Received: from rex.securecomputing.com ([203.24.151.4]:48223 "EHLO cyberguard.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751726AbZBCGlr (ORCPT ); Tue, 3 Feb 2009 01:41:47 -0500 Message-ID: <4987E727.4010708@snapgear.com> Date: Tue, 03 Feb 2009 16:41:43 +1000 From: Greg Ungerer User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Geert Uytterhoeven CC: uClinux development list , Sam Ravnborg , Linux/m68k , Linux Kernel Development Subject: Re: [uClinux-dev] [PATCH] m68k: Unify arch/m68k/include/asm/unistd.h References: <498599A6.7080202@snapgear.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Geert, Geert Uytterhoeven wrote: > On Sun, 1 Feb 2009, Greg Ungerer wrote: >> m68k: use non-mmu version of unaligned.h for all m68k > > And another one. The rest looks OK. I applied that to the m68knommu git tree too. Thanks Greg >>>From f94c9409356de883fd343cc7c0f25dd955bcad42 Mon Sep 17 00:00:00 2001 > From: Geert Uytterhoeven > Date: Mon, 2 Feb 2009 22:12:36 +0100 > Subject: [PATCH] m68k: Restore correct include guards for > > Signed-off-by: Geert Uytterhoeven > --- > arch/m68k/include/asm/unaligned.h | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h > index eb1ea4c..019caa7 100644 > --- a/arch/m68k/include/asm/unaligned.h > +++ b/arch/m68k/include/asm/unaligned.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_M68KNOMMU_UNALIGNED_H > -#define _ASM_M68KNOMMU_UNALIGNED_H > +#ifndef _ASM_M68K_UNALIGNED_H > +#define _ASM_M68K_UNALIGNED_H > > > #ifdef CONFIG_COLDFIRE > @@ -22,4 +22,4 @@ > > #endif > > -#endif /* _ASM_M68KNOMMU_UNALIGNED_H */ > +#endif /* _ASM_M68K_UNALIGNED_H */ -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear, a McAfee Company PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com