From patchwork Tue Feb  1 16:54:15 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Matt Turner <mattst88@gmail.com>
X-Patchwork-Id: 523491
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p11GvJj8021226
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Tue, 1 Feb 2011 16:57:39 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id CEB6D9E8AF
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Tue,  1 Feb 2011 08:57:18 -0800 (PST)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from mail-gx0-f177.google.com (mail-gx0-f177.google.com
	[209.85.161.177])
	by gabe.freedesktop.org (Postfix) with ESMTP id E770A9E78B
	for <dri-devel@lists.freedesktop.org>;
	Tue,  1 Feb 2011 08:57:08 -0800 (PST)
Received: by gxk21 with SMTP id 21so2668527gxk.36
	for <dri-devel@lists.freedesktop.org>;
	Tue, 01 Feb 2011 08:57:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer;
	bh=eRUiivIu7AizX8Yu2NJ051q5D91UDV1S0Vg2qTS/bcQ=;
	b=ul7Nve60X/eVAVrc77gSJMgD3iG3Z463SULHPtyb24NbVRpcTF+eoUYrbsETvqN13T
	GsQbn+VvO0QOCBat9G2xqmjUO0Xo0WJ/MK/LH7OC3EyqxEXrFgFEyB2r2A/TDM+FHnEa
	v19EM8pB3UZZIK4tXDG4q6mQ/Bq+LE5xapUiA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer;
	b=AlVhFjmOx2/VqDwaV8JpF4AE55CeN2S6ftNzUnxyxc4UTuID6bMIbnSUPMJtPzmOkM
	vDFDES8ULnBZ0ban5rcTWOdR1B2w46R6VCJedDBRnfVC6xS4kU6aJ3RGexCdqpCVVPZq
	z0riMtw0KW0q7iNNtF9l+6OBdcTiTmjv/5CZ8=
Received: by 10.236.102.179 with SMTP id d39mr16263969yhg.72.1296579259946;
	Tue, 01 Feb 2011 08:54:19 -0800 (PST)
Received: from localhost (cpe-071-070-208-019.nc.res.rr.com [71.70.208.19])
	by mx.google.com with ESMTPS id
	42sm5349030yhl.16.2011.02.01.08.54.17
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 01 Feb 2011 08:54:18 -0800 (PST)
From: Matt Turner <mattst88@gmail.com>
To: Dave Airlie <airlied@gmail.com>
Subject: [PATCH 1/2] Revert "agp: AMD AGP is used on UP1100 & UP1500 alpha
	boxen"
Date: Tue,  1 Feb 2011 11:54:15 -0500
Message-Id: <1296579256-14777-1-git-send-email-mattst88@gmail.com>
X-Mailer: git-send-email 1.7.2.2
Cc: Alan Hourihane <alanh@fairlite.demon.co.uk>,
	dri-devel@lists.freedesktop.org, linux-alpha@vger.kernel.org
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
	<dri-devel.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 01 Feb 2011 16:57:39 +0000 (UTC)


diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index fcd867d..d8b1b57 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -50,7 +50,7 @@ config AGP_ATI
 
 config AGP_AMD
 	tristate "AMD Irongate, 761, and 762 chipset support"
-	depends on AGP && (X86_32 || ALPHA)
+	depends on AGP && X86_32
 	help
 	  This option gives you AGP support for the GLX component of
 	  X on AMD Irongate, 761, and 762 chipsets.