From patchwork Wed Aug 6 16:55:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Krause X-Patchwork-Id: 4687171 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 26800C0338 for ; Wed, 6 Aug 2014 16:59:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62CA52010C for ; Wed, 6 Aug 2014 16:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72048200FF for ; Wed, 6 Aug 2014 16:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932663AbaHFQ7K (ORCPT ); Wed, 6 Aug 2014 12:59:10 -0400 Received: from mail-yk0-f193.google.com ([209.85.160.193]:44552 "EHLO mail-yk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757152AbaHFQzU (ORCPT ); Wed, 6 Aug 2014 12:55:20 -0400 Received: by mail-yk0-f193.google.com with SMTP id 142so474990ykq.0 for ; Wed, 06 Aug 2014 09:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=FYm6Js7CYVV4x1HUXdLedESODpydStwFaQT5rCeeo1k=; b=yOv8cI/cUh7tzPfK/Cy0+zkr9BdYcMnRq5yoLiAaTgRdhr30XesBVs3Za7/pQXZwas rx8gkcl74uIgx9iA1roje846MO2l2JrbTtE1dOI0BMBG6izkFvav37dQwgA9xlnz12sx Z88aukPmeQx7N+mDJmnkiYE4AYBN7y3lqeTRAU0yI0A6+DUN/GwxOxZartSV0lCTghai etX0Fkpr6Ox5lI2Sq5zaf1yVu/PIFp7E/buzTC2dDQBt6E7D2SlvnFpn2mgNfUzRCbjO paj4zkO9rektxOfj47mj6yJojt6i5BSpm30WAkFpkEkC7PZCO5Aoa0z04sq0mKFN8U9t alig== X-Received: by 10.236.106.10 with SMTP id l10mr18667340yhg.101.1407344119131; Wed, 06 Aug 2014 09:55:19 -0700 (PDT) Received: from localhost.localdomain (108-232-152-155.lightspeed.tukrga.sbcglobal.net. [108.232.152.155]) by mx.google.com with ESMTPSA id l65sm2601158yhb.45.2014.08.06.09.55.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 09:55:18 -0700 (PDT) From: Nick Krause To: Mark Brown , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] spi: Fix warning about redefinition Date: Wed, 6 Aug 2014 12:55:28 -0400 Message-Id: <1407344128-9754-1-git-send-email-xerofoiffy@gmail.com> X-Mailer: git-send-email 2.0.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Fix the following warnings about redefining READ and write drivers/spi/spi-omap-100k.c:73:0: warning: "WRITE" redefined [enabled by default] include/linux/fs.h:193:0: note: this is the location of the previous definition drivers/spi/spi-omap-100k.c:74:0: warning: "READ" redefined [enabled by default] include/linux/fs.h:192:0: note: this is the location of the previous definition Signed-off-by: Nick Krause --- drivers/spi/spi-omap-100k.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 5e91858..eb8ae4e 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -70,6 +70,12 @@ #define SPI_STATUS_WE (1UL << 1) #define SPI_STATUS_RD (1UL << 0) +#ifdef WRITE +#undef WRITE +#endif +#ifdef READ +#undef READ +#endif #define WRITE 0 #define READ 1