From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751390AbdFEUIX (ORCPT ); Mon, 5 Jun 2017 16:08:23 -0400 Received: from mail-bn3nam01on0071.outbound.protection.outlook.com ([104.47.33.71]:41040 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751181AbdFEUIS (ORCPT ); Mon, 5 Jun 2017 16:08:18 -0400 Authentication-Results: spf=pass (sender IP is 192.61.61.105) smtp.mailfrom=unisys.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=unisys.com; From: David Kershner To: , , , , , , , , , , Subject: [PATCH 1/3] include: linux: visorbus: Add visorbus to include/linux directory Date: Mon, 5 Jun 2017 16:07:30 -0400 Message-ID: <1496693252-4349-2-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496693252-4349-1-git-send-email-david.kershner@unisys.com> References: <1496693252-4349-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 05 Jun 2017 20:07:37.0536 (UTC) FILETIME=[60C69400:01D2DE37] MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.61.61.105;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(39410400002)(39400400002)(39840400002)(39450400003)(39860400002)(39850400002)(2980300002)(438002)(189002)(199003)(9170700003)(478600001)(9786002)(2201001)(2906002)(72206003)(46656002)(53936002)(47776003)(50986999)(106466001)(575784001)(9746002)(8936002)(86362001)(76176999)(2950100002)(83796002)(450100002)(356003)(81166006)(50226002)(8676002)(5003940100001)(50466002)(57986006)(6636002)(9306002)(189998001)(36756003)(305945005)(5660300001)(38730400002)(33646002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR0701MB1999;H:USEA-NAEDGE2.unisys.com;FPR:;SPF:Pass;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT037;1:05uWJ3iERaEh/fyRkhgdhEmtv3E4mu+ckQyJmrvISoV3Km22mzWNnTjNE0Yh2cwDHTAf++BzZwq6fktJisL61seI8BGBsVnov9NOlulpTvyB6/nVqly94HMOctmRZV0Tw9m7P4Ea9GjSNY7IblShTVOe7n7UxhsMniYibGsKytyMgK0ADXHkxJqhoF8Raitjyx6JaC93sXQ64vE6QKY7DiuGuVy3K2skB/mnKemej19zO/zXmUWe6flO9XcqnZcW/KD9cvHc76Cf54b8qnJJUaKD//GA7em/T8TPAdDoadfsTEfRbUuPg65HGsw/B4HG9Hz1opQ0HZZI/GTTOyHYRR8lUBAmBEAXBV49O6DiIWV9+KstfzEKPnpuV9dRctpx3TA2RI9oZ4Ce97P0UARHSg2Qd2slUyJF6sr/O9M9RwD6gbH55nnslP5vmzGdlBF7g3xD+2tmsT4nJy/SyphH50+J+u52XgQPtFzS4h271bamfR1KXca+4rTSYYNrXvOqhyAfqLnoIoFfTK510d0f+fkF0w5DAAts0BYJv/dbJe8= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PR0701MB1999: X-MS-Office365-Filtering-Correlation-Id: 8f5060bd-0217-4bf6-4a91-08d4ac4e9314 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR0701MB1999; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;3:9Vbg4Pd5sB3zC3vN891zCYi8Bxiu4iNY8dPQyEReqx5x7UKDQ2T758u1zgia7iebqodRx/OcxcAuq6Ta+mpuYHvNiktz+L45NNu9FHbn+9R8zyE4iSgzNFm7MPL6TCjRg8uXrlWDHzmVo7PwOkQ/gQ91RG3cOO3P/ioE1I2GWlhbVBFSKk3PMlE6ccZeXNM5cON8S+sMqt54sX4zPCKlmkyLRuFqpaWPYz+zltdJqiuWYjW38SJ/eAFwKsxrL8jmwUOm6UsA3S1x2aQmkD0J+MkuD3ROBXrdSWhwwJioPZcQG9B0Z7uJLr2Tq9AivXMWqoAPorH3100Bau0ISypm5Qr5kBZB7RqbV73pQaIh2HSZ5j8D0/7kLx3b39DGvvqHxN+xHiRpCPN5rMvrNeYDmqazo+fyPpbO1Sl7Yg1FXKfij3cHpQT85BotXyLigjQG6gkJrlAhD1xL2c0TtlPtc/kHzusrBAlQ5p/y/R1NCW/K7K54RL6kGasNtEbG6IIE3rJ1qLA+7OKuVfB89DUMbg== X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;25:DWXwzFUtfIYuNKvFqhRrUKIwGALDMZWe8b750poGTdvZJFRuKBNpKWu9XiKYBrhcR/8tDIVg/4KaD/QTqZYIbKx29PN7coS8gTp4meSCvAVZhg42QqiNUk1vCCKWuMT8//xbL/YO2xciyc3xL7T1GCW3iuMdmr8+ZlpzNvTIpWTyoh4lJKt3FvM0J4c79IY0OEFPqhrdq7cXWqHK/+ApHyAZGrZ4uFoKza5X+GMySaECp5HLKOk9rgWZ4KJI71nRAdKrhGhJJtmiWoBh3u1wnE4GHAgA5CHIeEJ3fVlGT63bd8IpsvqgdGUjd81MgeIZmf3DXI89emN1Nh2cWVU7UEbQ58CMVXE5sDJR4qz3kCofHh6JlqeLN8ozj3221a0P6XkVu53P9tA+dIBScCgDg0yxDq5spHemRXYbff+MefQJs74MuiDTls+iNRtEpVPkg2MBdgCAC0hQYF/0IVUJBQ6lkjt8lJV2VCGNFkNsTjw=;31:LSUEW1L+x61SzTUbMQkBh3fQcTG36rhStR/OKHv67lg3qf2aZNmA9uElgjYAOKSZwMKYS6eCgwxgvnnbfJM8iqATiXN9WFE0BMtFVjNjkTdYWkRv68eRqbpdnK8Qy1YKD3TAI/Xlz3b962ME/s0p5ihqDKRBwNod6pwDYTQ8zy4Zx/7t5QwyZFRvSi7fPP61r8xpH0/gLA3ip7MRREmVmBp/ODHiKIsRyZ4pQL93xSbkLRQPwQWdetzuGI/Y7LXL X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;20:BYD4c2P7m7taIHvOGvLX5xRJOMTgEeLeujiRsbyrTztSgR79mUCArIcnKpMxX4tpoDUSYrbXFxepfOrmw1jgw3k1J7irplO4Ow+ITbyIkSToIe//0efNmXq6x/9QfstyP8jLatXwOwPtRhXte/DRLFWHnnCiH2D+VzIJJY8rSEWk7mZsO2/Snyb+OFJ9DiPedk76glMsTKHUytZD9Ssp2O6KfxZWV4qkhHpleyFPOVL4wc45KuuG3vvo78TR1YYhGqIeCH1HmWON9g36Zeg5kZG8nNneEM1dKxLhvbzg19+uZLf1w/+Wmn39krF7UNls3fd5g7TNB2ErXhCid5lt1hjB5vxj6SNQjCtUvNJj7OTSillvHBhlAktys35+ivu+b4zYHWYxRTxuBvVrpkUDImHyBWPf/mfLM3B4VeMIGkWnNgO11X0P1unGt7IGzevS57/nUSX+T5MK+8LH1H2EyTsfBrqBNzewKobN4TAtfvomkG+LtksGv132Fq4js1jn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(174360191007938); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(8121501046)(5005006)(13016025)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93004095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR0701MB1999;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR0701MB1999; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0701MB1999;4:aufxG2xwfVcYw1NqLl+iYzGoXup0VdXaxcYRcZMu?= =?us-ascii?Q?gyjDml+FCetcJfr+W6taiIO4O8iK59DFbNq8rje6qNmqtbX05jOcgepHlYM0?= =?us-ascii?Q?zLkh34JVOJfYn1Kaq1iGg9Kb8kXVakYQ6JB8VKNVChzq6UIV5NSPv1XgF2gE?= =?us-ascii?Q?9MUv0OHS2RVnZgiInSiDjhBZeRCFrrh5nBunTLNaEgYzLdGlhA/5fgKyTtKY?= =?us-ascii?Q?aqkbfqefey8urZ4iqs40YC2jAx0ScvtLlmdWJex9pWd4Y8dGNM1Lb2Z8GW6w?= =?us-ascii?Q?OmmOKD6/uTbomlLGcJ5sxNtmlC5eAGGgzi3a5nba2OOQrsNgBb1HQH7z8kfc?= =?us-ascii?Q?+IYAlEraH2/syOca9vbIAklFHk1xO21F1MFDdVC7Ka92+jjUYnB1lOZd3Z0G?= =?us-ascii?Q?45qfzIrJmM/i4H4pY2QRl30izMy+fAC+TcerUwr+t6W0O8a2TU1WG/qiwnOt?= =?us-ascii?Q?v9pvO/ICrdJCBiMb6PRV6lZr/Egt5TG7uxIU4jZvaXplk5hMDuC5emp4ZaJz?= =?us-ascii?Q?j71IZaqdfThk5b4PZj67iUybojjC0mW9Nqsqgqwaeaqeh4jE38mt/IHBLdYO?= =?us-ascii?Q?l1PxK9P19rIDsDleKF/oLGYmTX2PPO5w5lJ2UZEnIivAamBp60ko4IgukPIr?= =?us-ascii?Q?9EUOcLu26jIrr1Q4I8PJVOVOZRgtIE4DtLyLgH6umEKA80NNSkFXPqmPJMve?= =?us-ascii?Q?zBzH3hx9IGTOmqQy+hdLZTItB9qE5FZrNsY5mscMnB3SQocDwZNyCqiDgryl?= =?us-ascii?Q?Vqup0GDp1KzuvMMPoIWv+pC803KvDo8aznY91q4hxgFC0c2EzUh+9eZQazXf?= =?us-ascii?Q?7dHKXqasaji4/kuzD7yPn3E44Nlw2OMjtYM+i5HG0wisqPbPvib+fTFriRDN?= =?us-ascii?Q?S5DW6tSBN1N/NU0uWKDmKDlLqguRi5o2uoSK2YFWJlxUr0lgE/aTt1ltTWTS?= =?us-ascii?Q?4O8ee5z9a2zGWx17zwyqej7ifeVYFsT7mpBIyeQRChhGIyQ3R8WhmFbXXPG/?= =?us-ascii?Q?IvDHRgHj3SXIw6q2QH5n2Zn19ERojEEr7nEsuiUC7rTHtceCfPLD/tTaV5Vf?= =?us-ascii?Q?VISV+nx1hqmZhCByT+0ec5V+fkuWyq621Dl6LmxPhwmRf7038trcqbqHp/Pb?= =?us-ascii?Q?cuJKGRCh88lk1JenqYufFTTtwLPQwxwlHmHiIcQCWrBTVjk8xXzKiMpV9uBj?= =?us-ascii?Q?RfmjhI8AcdZ3FnNZFkOl7QogoacHPRbRlwGyHMU9u2TFG88PND7ZNLyORg?= =?us-ascii?Q?=3D=3D?= X-Forefront-PRVS: 0329B15C8A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0701MB1999;23:3HaFTjUqMBJy1x8cvFILEdydGqV89xAn3FNWfMG?= =?us-ascii?Q?WU7VfL3PN6zNdwbbGhZ0OMsQN30l+XeO3RAfNbvTuXCiCmSLjCT6FjdKGd8e?= =?us-ascii?Q?lG7g0t3agl6bxioL8xKky4+Yd+ZuImxk0alRfEPL/7ZuBoLY9vYGKMiNVhLF?= =?us-ascii?Q?+WcjgIeLtI7STwFGNsJzkELpLKG1aEClbtY6sE/RrNddJoOhKyGKj5LLwgyM?= =?us-ascii?Q?HOUntP7AocfGlzv3JAMeLVFxIwivqGPFrAjLOBz5XkFh5m4NEz+YSaVnAknr?= =?us-ascii?Q?JB06R9k1cNs/G/E6wsCAUDk/8y8mpUc7JDjMooqqZIJGweNbHjqOfmex6sx4?= =?us-ascii?Q?Ud/YhZcVCK9Sy587+MkMGLeIzUYSN/dVAWR64Su9C+L4l1hpnK6Pf8qQlz6t?= =?us-ascii?Q?Za67OPm9GSv6ywPfyz0Hclbz/9U6Kde4QUaVBcaPRpp0torcGSdBa9IGbor8?= =?us-ascii?Q?kZ1gyU8sNj2AiODg8zUr9F5cLdq1++85onD/3jRn4FevvYtsRdu7npMwgg8A?= =?us-ascii?Q?wgDBFdGX/zmXFRpmlAo8CXSLUZ2tYs44TYYkKQWz2tztwQdR0ffYsajGvAAC?= =?us-ascii?Q?on8g3AhVj5+yfKOkQ070kXd/jwuQ/JkyIaxQ0f5/sm5AL/cyf6pFp+rCS9g2?= =?us-ascii?Q?aVhuJ1RH6OekROin8qlEj97ysR1o3fQGzq1Am2zgAI+qKTR8cw0wZGv5NrNm?= =?us-ascii?Q?TWF/iqiePWtn8JITxL6RQR3HFyYcGjxDPpDGY1JCsKNzWbg+1fJUwRyFeNVG?= =?us-ascii?Q?cKGjlSbUlbjDD/OFIftNe9PZeUbP47jraeAFRkvz86LAUf7mirO8WET34AFy?= =?us-ascii?Q?NNGrqlV+JDLeej81RXpwtEwEs5gjIuO0xw49qxs4Dnmqbsa6gRFDhtCljFfQ?= =?us-ascii?Q?B8ADagF+1S+cr47iEh3kPvKbHcxdgdBf77pq7WYEp46k9JrQC+WoQh/nYJqC?= =?us-ascii?Q?ijtDhCX3ZUMT8IOAG8+fwmj61mK8XlykFxti1d7z1ZJD3vXUsh0Du7ZXpOMu?= =?us-ascii?Q?4JWkrjv8Rnl9KxTmY4Cqi6+ZaLiwoeFW5SFJXAvnyRVXNLC2DRJsW9BlZvU1?= =?us-ascii?Q?c0rSTvAATNb1ErhkGQWdGp6dkH72Gfr9+0IjQ3W/7z1f9eMPI7ANI5Q+T6k1?= =?us-ascii?Q?8OyNWbCyuvwrZixFe11fj/V5N+qYirjVThSRHDC5IrAbGWOtIGtFyqw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;6:CwXvCXASiuuUZW02WRYaLEfm62PgbqShssA7gXSk4HQXZWghHtoAQo2hCWxE7cu3BrIDiUjKCwVsllAsconL5N/KwyrUTuHzkW+sPv6GdFOyuYMnOb93H6ZAJA3GNOHhgh0OJOygxyaKAy3CTyNHAKm1TjFpbKkBbb7NmSPB749Mdq5JWwEIrh92H6lYf1O66TUYpmayP2fqjjzUz2wq9CPGlSlTw/UYko+cc5yo6grO6EpktQLM9+khIZXCJT3hwfE/kHjO1w7Ci2cX71gRq4hUgBx/HRDgOGkzHHWNst2Cpn4OcTcQvkC4h5SibBmgxNYPDVt1d5AKrDDUI+U7piNAsMjz5gkJ6IbUGnQYzahF6Z15qlXqGj8AQNIP3ijCnwhbKqMzMTjcDAhojZJYmOOqzMvxCgKruRsMIBo0ViudqfmVvfniJSfARGhoaFI+GZs8l7uRYr15nhF10JvhWraOh2YbC75YrZEvgRHXdBg/4ZMDjOXX2w9zAZuZcvcZI1youn6QLHROGT7HA48Zmg== X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;5:FbDYQYPbSPa+me4bIjAUumoxppLnxX1sCUwalenRbiALBDH2Z2VlQqv8qIAploXI1eYmOQ22oPgkhcVlInDsqQnhfKAlrhvOy6WN3HSCg6AOyqxiRlXv3nVn49C0Ba+3bB+3AKUNPVbUaIT9Dcbe8tkEjvZ4CrDIIQPwkz78KpeBpC/ZzdWZghzbl7Y/mUalfwHAeDQAHWM65AwGdv21vq8EZw4FifPDAa0yTZ87To59vN3M/VHqpitHr4ITQ89EdVyxPzuADT7fNSG0Q6PJg3h1Mxv0Y5rF7TBGr3hCIlsyGW9VQeDWOijv3bRBwtKZkdNtAAb2b/79Fx1+70ScP/6nHXmSL8Hc+nLxHqaC4857vScRSzFqWa7p3j/vTo5D3CMHW/ssNCGf7H/DtywTIVgxMOmH+caXEp9IFbG30KT7JQtpW3T/UQTHZK0288mUIyj4IVrk0ZsFfbF3N5A/oLLQtaLDyLEklkVtX8cng0Fzuxg91bbBU13jmRLYRuPI;24:SwwhyT61BZ79hpx+x++CHdcQ6m8d4L1DQnNCICGJyGc1io9oDuj7qzqk2FRzMPkf4OfP6x63i7WbCKZOPP+wOJ5FT6yvU5SOyudiE7l4Dgs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1999;7:qaOJKzh6N8ugLO6hZpi1HCGVBBXdRoN6baAiRMY74ABvGWL37LY6npE7uMxvdnRxyFw2vyiBFfKlqCrwyx0BrF8aSWHrfiwaa4eL8xqgXYfOnj7I98+JkxfHX4CRr6GRyhdG5uijWPcfB6V0wsahWVQtBzi2+6pshTfKGwxt82jW8KGXu/KPZr+r/bRBWDx54cR9qX0aM1SPn6/JCXCavhPgp9N6d/Udif2DO17VkdHRJYZcSj2LlkpBcKhftjISjvodFr4TIAncEeuCVMENTSg/IqMisSTdO7v2kXgA3Zn8qUSrARWIurCFX3OS2MwE+56BcLKGGSYXdqV3HwW+fQ== X-OriginatorOrg: unisys.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2017 20:08:03.8897 (UTC) X-MS-Exchange-CrossTenant-Id: 8d894c2b-238f-490b-8dd1-d93898c5bf83 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=8d894c2b-238f-490b-8dd1-d93898c5bf83;Ip=[192.61.61.105];Helo=[USEA-NAEDGE2.unisys.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0701MB1999 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update include/linux to include the s-Par drivers set's common header files, which are needed for the s-Par visorbus. Since the include directories are now moved to include/linux/visorbus, this patch makes all the s-Par drivers (visorbus, visorinput, visornic, and visorhba) use the new include folder. Signed-off-by: David Kershner Reviewed-by: Tim Sell --- MAINTAINERS | 1 + drivers/staging/unisys/visorbus/Makefile | 2 -- drivers/staging/unisys/visorbus/controlvmchannel.h | 2 +- drivers/staging/unisys/visorbus/vbuschannel.h | 2 +- drivers/staging/unisys/visorbus/visorbus_main.c | 2 +- drivers/staging/unisys/visorbus/visorchannel.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- drivers/staging/unisys/visorhba/Makefile | 3 --- drivers/staging/unisys/visorhba/visorhba_main.c | 4 ++-- drivers/staging/unisys/visorinput/Makefile | 2 -- drivers/staging/unisys/visorinput/visorinput.c | 2 +- drivers/staging/unisys/visornic/Makefile | 2 -- drivers/staging/unisys/visornic/visornic_main.c | 5 ++--- {drivers/staging/unisys/include => include/linux/visorbus}/channel.h | 0 .../staging/unisys/include => include/linux/visorbus}/iochannel.h | 2 +- .../staging/unisys/include => include/linux/visorbus}/visorbus.h | 3 +-- 16 files changed, 13 insertions(+), 23 deletions(-) rename {drivers/staging/unisys/include => include/linux/visorbus}/channel.h (100%) rename {drivers/staging/unisys/include => include/linux/visorbus}/iochannel.h (99%) rename {drivers/staging/unisys/include => include/linux/visorbus}/visorbus.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 9e98464..0893d53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13116,6 +13116,7 @@ M: David Kershner L: sparmaintainer@unisys.com (Unisys internal) S: Supported F: drivers/staging/unisys/ +F: include/linux/visorbus/ UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER M: Vinayak Holikatti diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/staging/unisys/visorbus/Makefile index f3730d8..7f328cc 100644 --- a/drivers/staging/unisys/visorbus/Makefile +++ b/drivers/staging/unisys/visorbus/Makefile @@ -7,5 +7,3 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus.o visorbus-y := visorbus_main.o visorbus-y += visorchannel.o visorbus-y += visorchipset.o - -ccflags-y += -Idrivers/staging/unisys/include diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h index ed045ef..875603b 100644 --- a/drivers/staging/unisys/visorbus/controlvmchannel.h +++ b/drivers/staging/unisys/visorbus/controlvmchannel.h @@ -16,7 +16,7 @@ #define __CONTROLVMCHANNEL_H__ #include -#include "channel.h" +#include /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */ #define VISOR_CONTROLVM_CHANNEL_UUID \ diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h index 01d7d51..dd9df0a 100644 --- a/drivers/staging/unisys/visorbus/vbuschannel.h +++ b/drivers/staging/unisys/visorbus/vbuschannel.h @@ -24,7 +24,7 @@ */ #include #include -#include "channel.h" +#include /* {193b331b-c58f-11da-95a9-00e08161165f} */ #define VISOR_VBUS_CHANNEL_UUID \ diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c index 1c785dd..bf759e7 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -16,8 +16,8 @@ #include #include +#include -#include "visorbus.h" #include "visorbus_private.h" #define MYDRVNAME "visorbus" diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c index 6885c2c..8c05af6 100644 --- a/drivers/staging/unisys/visorbus/visorchannel.c +++ b/drivers/staging/unisys/visorbus/visorchannel.c @@ -21,8 +21,8 @@ #include #include +#include -#include "visorbus.h" #include "visorbus_private.h" #include "controlvmchannel.h" diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 2215056..1324849 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -22,8 +22,8 @@ #include #include #include +#include -#include "visorbus.h" #include "visorbus_private.h" #include "vmcallinterface.h" diff --git a/drivers/staging/unisys/visorhba/Makefile b/drivers/staging/unisys/visorhba/Makefile index a8a8e0e..c321f6a 100644 --- a/drivers/staging/unisys/visorhba/Makefile +++ b/drivers/staging/unisys/visorhba/Makefile @@ -5,6 +5,3 @@ obj-$(CONFIG_UNISYS_VISORHBA) += visorhba.o visorhba-y := visorhba_main.o - -ccflags-y += -Idrivers/staging/unisys/include - diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 2fd31c9..75ca181 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -18,13 +18,13 @@ #include #include #include +#include +#include #include #include #include #include -#include "visorbus.h" -#include "iochannel.h" /* The Send and Receive Buffers of the IO Queue may both be full */ diff --git a/drivers/staging/unisys/visorinput/Makefile b/drivers/staging/unisys/visorinput/Makefile index beedca7..87426a0 100644 --- a/drivers/staging/unisys/visorinput/Makefile +++ b/drivers/staging/unisys/visorinput/Makefile @@ -3,5 +3,3 @@ # obj-$(CONFIG_UNISYS_VISORINPUT) += visorinput.o - -ccflags-y += -Idrivers/staging/unisys/include diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index 45bc340..7e5594e 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -28,8 +28,8 @@ #include #include #include +#include -#include "visorbus.h" #include "ultrainputreport.h" /* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */ diff --git a/drivers/staging/unisys/visornic/Makefile b/drivers/staging/unisys/visornic/Makefile index 439e95e..43985bb 100644 --- a/drivers/staging/unisys/visornic/Makefile +++ b/drivers/staging/unisys/visornic/Makefile @@ -6,5 +6,3 @@ obj-$(CONFIG_UNISYS_VISORNIC) += visornic.o visornic-y := visornic_main.o -ccflags-y += -Idrivers/staging/unisys/include - diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c index 2891622..1663945 100644 --- a/drivers/staging/unisys/visornic/visornic_main.c +++ b/drivers/staging/unisys/visornic/visornic_main.c @@ -24,9 +24,8 @@ #include #include #include - -#include "visorbus.h" -#include "iochannel.h" +#include +#include #define VISORNIC_INFINITE_RSP_WAIT 0 diff --git a/drivers/staging/unisys/include/channel.h b/include/linux/visorbus/channel.h similarity index 100% rename from drivers/staging/unisys/include/channel.h rename to include/linux/visorbus/channel.h diff --git a/drivers/staging/unisys/include/iochannel.h b/include/linux/visorbus/iochannel.h similarity index 99% rename from drivers/staging/unisys/include/iochannel.h rename to include/linux/visorbus/iochannel.h index c7cb3fb..c44b9b2 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/include/linux/visorbus/iochannel.h @@ -32,7 +32,7 @@ #include #include -#include "channel.h" +#include #define VISOR_VHBA_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE #define VISOR_VNIC_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE diff --git a/drivers/staging/unisys/include/visorbus.h b/include/linux/visorbus/visorbus.h similarity index 99% rename from drivers/staging/unisys/include/visorbus.h rename to include/linux/visorbus/visorbus.h index de06355..9814b21 100644 --- a/drivers/staging/unisys/include/visorbus.h +++ b/include/linux/visorbus/visorbus.h @@ -36,8 +36,7 @@ #include #include #include - -#include "channel.h" +#include struct visor_driver; struct visor_device; -- 1.9.1