| Message ID | 1433952538-22455-8-git-send-email-Suravee.Suthikulpanit@amd.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show
Return-Path: <linux-acpi-owner@kernel.org> X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8B72AC0020 for <patchwork-linux-acpi@patchwork.kernel.org>; Wed, 10 Jun 2015 16:11:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B72602057E for <patchwork-linux-acpi@patchwork.kernel.org>; Wed, 10 Jun 2015 16:11:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF4B420575 for <patchwork-linux-acpi@patchwork.kernel.org>; Wed, 10 Jun 2015 16:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965267AbbFJQKE (ORCPT <rfc822;patchwork-linux-acpi@patchwork.kernel.org>); Wed, 10 Jun 2015 12:10:04 -0400 Received: from mail-bl2on0113.outbound.protection.outlook.com ([65.55.169.113]:47296 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966681AbbFJQJR (ORCPT <rfc822;linux-acpi@vger.kernel.org>); Wed, 10 Jun 2015 12:09:17 -0400 Received: from BLUPR02MB067.namprd02.prod.outlook.com (10.242.187.153) by BLUPR02MB1713.namprd02.prod.outlook.com (25.162.213.139) with Microsoft SMTP Server (TLS) id 15.1.184.17; Wed, 10 Jun 2015 16:09:15 +0000 Received: from BY2PR02CA0033.namprd02.prod.outlook.com (10.141.216.23) by BLUPR02MB067.namprd02.prod.outlook.com (10.242.187.153) with Microsoft SMTP Server (TLS) id 15.1.172.22; Wed, 10 Jun 2015 16:09:14 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::149) by BY2PR02CA0033.outlook.office365.com (2a01:111:e400:2c40::23) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Wed, 10 Jun 2015 16:09:13 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; arm.com; dkim=none (message not signed) header.d=none; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp02.amd.com (165.204.84.222) by BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) with Microsoft SMTP Server id 15.1.190.9 via Frontend Transport; Wed, 10 Jun 2015 16:09:11 +0000 X-WSS-ID: 0NPQKV9-08-K9J-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 221FED16025; Wed, 10 Jun 2015 12:09:09 -0400 (EDT) Received: from SATLEXDAG01.amd.com (10.181.40.3) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 10 Jun 2015 11:09:42 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by SATLEXDAG01.amd.com (10.181.40.3) with Microsoft SMTP Server id 14.3.195.1; Wed, 10 Jun 2015 12:09:08 -0400 From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> To: <rjw@rjwysocki.net>, <lenb@kernel.org>, <catalin.marinas@arm.com>, <will.deacon@arm.com>, <thomas.lendacky@amd.com>, <herbert@gondor.apana.org.au>, <davem@davemloft.net>, <arnd@arndb.de>, <kashyap.desai@avagotech.com>, <sumit.saxena@avagotech.com>, <uday.lingala@avagotech.com>, <vinholikatti@gmail.com> CC: <msalter@redhat.com>, <hanjun.guo@linaro.org>, <al.stone@linaro.org>, <grant.likely@linaro.org>, <leo.duran@amd.com>, <linux-arm-kernel@lists.infradead.org>, <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linaro-acpi@lists.linaro.org>, <netdev@vger.kernel.org>, <linux-crypto@vger.kernel.org>, "Suravee Suthikulpanit" <Suravee.Suthikulpanit@amd.com> Subject: [V6 PATCH 7/7] ufs: fix TRUE and FALSE re-define build error Date: Wed, 10 Jun 2015 11:08:58 -0500 Message-ID: <1433952538-22455-8-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433952538-22455-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1433952538-22455-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:xyGCZZWqMI62PjUHenEegI5b/xbT7JDgaB4Bctk30ALUsI2YmGUjjgj/smmXWDtRxvPuGAWKAzYkvDj+ItIWrqHtXaXR0cJpED5hUAw8Ynz/aiUyN+q0zoOh09fNswQYtjqYEd9yMrvFCDjNtM3iSbF2PzxdKhcL0vUjBrZplgcSldAkP47bmb+4ZUCHffzJ6do6RtQRfYqX7dIzS9CGZLDhRCjCvn4tLgc2h29wDQjcpFGfOiv3WKydyJOrU+65dox2RlwMYAGSi/4VH9AHJDrYrpV1pM8O10QUnoyHcabiL4vAhVjU3AQK5j1UJOlhU72ekHjQ1PHHvDI6TxFeZQ== X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(199003)(189002)(77096005)(62966003)(53416004)(19580395003)(87936001)(50226001)(575784001)(2201001)(229853001)(36756003)(189998001)(86362001)(92566002)(19580405001)(76176999)(101416001)(2950100001)(5001770100001)(46102003)(47776003)(48376002)(105586002)(77156002)(50986999)(5003600100002)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR02MB067; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB067; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB1713; X-Microsoft-Antispam-PRVS: <BLUPR02MB067014131A9A62895A7D797F3BD0@BLUPR02MB067.namprd02.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BLUPR02MB067; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB067; X-Forefront-PRVS: 06036BD506 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2015 16:09:11.3510 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96; Ip=[165.204.84.222]; Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB067 X-OriginatorOrg: amd.com Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: <linux-acpi.vger.kernel.org> X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h index 3fc3e21..816a8a4 100644 --- a/drivers/scsi/ufs/unipro.h +++ b/drivers/scsi/ufs/unipro.h @@ -198,6 +198,14 @@ enum ufs_hs_gear_tag { #define T_TC0TXMAXSDUSIZE 0x4060 #define T_TC1TXMAXSDUSIZE 0x4061 +#ifdef FALSE +#undef FALSE +#endif + +#ifdef TRUE +#undef TRUE +#endif + /* Boolean attribute values */ enum { FALSE = 0,
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Cc: Vinayak Holikatti <vinholikatti@gmail.com> --- drivers/scsi/ufs/unipro.h | 8 ++++++++ 1 file changed, 8 insertions(+)