From patchwork Wed Jan 21 01:50:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 3379 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0L1kMpM008522 for ; Tue, 20 Jan 2009 17:46:23 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754093AbZAUBu4 (ORCPT ); Tue, 20 Jan 2009 20:50:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753203AbZAUBuz (ORCPT ); Tue, 20 Jan 2009 20:50:55 -0500 Received: from wf-out-1314.google.com ([209.85.200.175]:48909 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752788AbZAUBuy (ORCPT ); Tue, 20 Jan 2009 20:50:54 -0500 Received: by wf-out-1314.google.com with SMTP id 27so4096656wfd.4 for ; Tue, 20 Jan 2009 17:50:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=EfLxZIa0fVzWYAamzQXp3qFcSh0oaFFvjAHdGLyxpuU=; b=kLHKyiTkyheQjibPnS2BLlct7RDKuiKqrnDwgeEeuu0ZOigQDDC4AiW9raGZ/bBBk4 rFNUhwNoTdJwc3cD9dnwapsPofxEjGBmaPshYEnWfUsoP74fUo6U5O64bTamSCmHOBEc TANr6FI1BW3EzMQ5odIz1L7ITKybbonpr31ik= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=kiunvYybNaVbWJua3p3FOTkdLC3LHUkAfmcFppZrymPI/I+o6xuOkl7PXdlhFrFHOZ bvyXmvEArB9RxgfRBRRdA5puBPjKquzmj6iHs/8tnuSkc1RUhfQAwryfochcJA5jciUw v4onK4bdrl0POK45UO+ledLGSbVaWiCPtaCEg= Received: by 10.143.42.6 with SMTP id u6mr1336042wfj.144.1232502653285; Tue, 20 Jan 2009 17:50:53 -0800 (PST) Received: from ?192.168.1.100? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 27sm12001467wfa.29.2009.01.20.17.50.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Jan 2009 17:50:53 -0800 (PST) Subject: [PATCH] m68k{nommu}: fixups after the header move From: Harvey Harrison To: Greg Ungerer Cc: torvalds@linux-foundation.org, arnd@arndb.de, gerg@uclinux.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org, sam@ravnborg.org, uclinux-dev@uclinux.org, zippel@linux-m68k.org In-Reply-To: <1232502275.5653.2.camel@brick> References: <200901210058.n0L0wjdf005545@localhost.localdomain> <1232502275.5653.2.camel@brick> Date: Tue, 20 Jan 2009 17:50:51 -0800 Message-Id: <1232502651.9701.0.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org swab.h seems to have been missed during the header merge. Add conditionals similar to byteorder.h and remove the now unnecessary byteorder_no/mm.h Signed-off-by: Harvey Harrison --- arch/m68k/include/asm/byteorder.h | 11 ++++++----- arch/m68k/include/asm/byteorder_mm.h | 6 ------ arch/m68k/include/asm/byteorder_no.h | 6 ------ arch/m68k/include/asm/swab.h | 5 +++++ 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index f20502a..31b260a 100644 --- a/arch/m68k/include/asm/byteorder.h +++ b/arch/m68k/include/asm/byteorder.h @@ -1,5 +1,6 @@ -#ifdef __uClinux__ -#include "byteorder_no.h" -#else -#include "byteorder_mm.h" -#endif +#ifndef _M68K_BYTEORDER_H +#define _M68K_BYTEORDER_H + +#include + +#endif /* _M68K_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/byteorder_mm.h b/arch/m68k/include/asm/byteorder_mm.h deleted file mode 100644 index 31b260a..0000000 --- a/arch/m68k/include/asm/byteorder_mm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68K_BYTEORDER_H -#define _M68K_BYTEORDER_H - -#include - -#endif /* _M68K_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/byteorder_no.h b/arch/m68k/include/asm/byteorder_no.h deleted file mode 100644 index 9c6c76a..0000000 --- a/arch/m68k/include/asm/byteorder_no.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_BYTEORDER_H -#define _M68KNOMMU_BYTEORDER_H - -#include - -#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index e69de29..7d7dde1 100644 --- a/arch/m68k/include/asm/swab.h +++ b/arch/m68k/include/asm/swab.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "swab_no.h" +#else +#include "swab_mm.h" +#endif