From patchwork Fri Jan 27 14:29:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92653 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229176obz; Fri, 27 Jan 2017 06:31:23 -0800 (PST) X-Received: by 10.200.45.144 with SMTP id p16mr7783996qta.141.1485527483141; Fri, 27 Jan 2017 06:31:23 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q1si3643642qtq.167.2017.01.27.06.31.22; Fri, 27 Jan 2017 06:31:23 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CB5B462E14; Fri, 27 Jan 2017 14:31:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E3FC260D6C; Fri, 27 Jan 2017 14:29:57 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5A342609AC; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 5CA23609AC for ; Fri, 27 Jan 2017 14:29:48 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id z134so162790528lff.3 for ; Fri, 27 Jan 2017 06:29:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IasVUv/t5/YLUjVwPrJQEy/OxmzqaVRZvuy8z+ePB6o=; b=s9V8RM2Mj77dz/XwX9SG1pfOO7TyGQEsB3Iy54laJMV0etaGbhHVkO+AOWgWt+XRGz CWuyt+e2ZRraU6CCdK1JxwJ5sF67At1apEPJRFj3tK5pAOWBT+/ntAxPE6dChuR1gxdd KDPAtavLRXHkEMsD+SRwu4ZvBJgUOJ5sMIqNnqd6H7ggl/GMlltG8VeVRG/EXIvmgd0V ClRxB4d3VW9qm2P4bB+c8f5NjBKx/hBF9Ie4AYfD8QfRMEBB9PyunlIapsIZ3fbIjdBk 8efRfoXV0Q6OJ0v6E/YStxUwiY37Cxm/Q7y8/wS3CWIcNhzZQ5a5+smJVQhx76WGq1B1 0/yw== X-Gm-Message-State: AIkVDXIvcAZ6ZUSM/B4POkp0eqTrFICCxGcXH4CsUz1fjqQFqUbWmv4zNFdPwt+zFAwlHDJ8KbU= X-Received: by 10.25.17.29 with SMTP id g29mr2612972lfi.10.1485527387197; Fri, 27 Jan 2017 06:29:47 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:46 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:08 +0300 Message-Id: <20170127142921.29029-3-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 02/15] merge fix: doc/driver-api-guide/Doxyfile X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" --- doc/driver-api-guide/Doxyfile | 10 ---------- 1 file changed, 10 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile index e3d3f920..b5f7260e 100644 --- a/doc/driver-api-guide/Doxyfile +++ b/doc/driver-api-guide/Doxyfile @@ -5,7 +5,6 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/driver-api-guide \ $(SRCDIR)/include/odp/drv \ -<<<<<<< HEAD $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ $(SRCDIR)/include/odp_drv.h PREDEFINED = __GNUC__ \ @@ -16,12 +15,3 @@ PREDEFINED = __GNUC__ \ __x86_64__ \ ODPDRV_PACKED \ "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" -======= - $(SRCDIR)/include/odp_drv.h -EXCLUDE_PATTERNS = drv* odp_drv.h -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" \ - odpdrv_bool_t=int -WARNINGS = NO ->>>>>>> v1.13.0.0