From patchwork Fri Oct 10 18:53:21 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Boyer X-Patchwork-Id: 3851 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id E208D475F8 for ; Sat, 11 Oct 2008 06:01:10 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 363 seconds by postgrey-1.31 at ozlabs; Sat, 11 Oct 2008 06:00:49 EST Received: from mail-gx0-f14.google.com (mail-gx0-f14.google.com [209.85.217.14]) by ozlabs.org (Postfix) with ESMTP id 76808DE69D for ; Sat, 11 Oct 2008 06:00:49 +1100 (EST) Received: by gxk7 with SMTP id 7so624329gxk.9 for ; Fri, 10 Oct 2008 12:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent :sender; bh=bb6rr5UYORLBp/WHx2c5UJvYOjRtrgxtme+6mD5g2cY=; b=Is3YLBujuEvU5FwpYKQgFSAUUH7Kc3jgV99/TPLlG5yntOVT1PSdMBHv99htOQFzuW RtQ00UJrMZmtnH8P5P3anV7cFSSbmNMsw49gHCtiURTqAN58wmeDZBbs9GEa8uIM9qnv ovZ9JmYtYv+L53qGXpC1XveU/JRYEST3Y56FM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent:sender; b=VaqOWi78lMkleszFgd17yU4x4lCnf6a1BKXYCrki0rWDkNEpYQy/8aBIbOHZ6+j2/s YtydpkREL4tLvUW9EppJSUyu8g1Dy5dFSkrqojDoQ1QvPcjAXkvVmVa2ld3FlqJY6u/5 VltoLyb92+ZZMI4KUJvvcX4Jmv+UUax8nV2tM= Received: by 10.151.10.7 with SMTP id n7mr2710751ybi.201.1223664884575; Fri, 10 Oct 2008 11:54:44 -0700 (PDT) Received: from yoda.jdub.homelinux.org (24-247-237-59.dhcp.aldl.mi.charter.com [24.247.237.59]) by mx.google.com with ESMTPS id s27sm3096620qbs.12.2008.10.10.11.54.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 10 Oct 2008 11:54:44 -0700 (PDT) Date: Fri, 10 Oct 2008 14:53:21 -0400 From: Josh Boyer To: benh@kernel.crashing.org, paulus@samba.org Subject: [PATCH] Remove old workaround for arch/ppc vs. arch/powerpc from Makefile Message-ID: <20081010185321.GA16769@yoda.jdub.homelinux.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Cc: linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org There is an old workaround in the sysdev/Makefile for dealing with arch/ppc vs. arch/powerpc compiles. This is no longer needed as arch/ppc is dead. Signed-off-by: Josh Boyer Acked-by: Kumar Gala diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 55618ba..a44709a 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -38,15 +38,12 @@ ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_4xx) += ppc4xx_pci.o endif -# Temporary hack until we have migrated to asm-powerpc -ifeq ($(ARCH),powerpc) obj-$(CONFIG_CPM) += cpm_common.o obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o obj-$(CONFIG_PPC_DCR) += dcr.o obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o obj-$(CONFIG_UCODE_PATCH) += micropatch.o -endif ifeq ($(CONFIG_SUSPEND),y) obj-$(CONFIG_6xx) += 6xx-suspend.o