From patchwork Fri Oct 28 03:32:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9401163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 74A0C6022E for ; Fri, 28 Oct 2016 04:32:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 629E62A54E for ; Fri, 28 Oct 2016 04:32:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 572272A550; Fri, 28 Oct 2016 04:32:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAB652A54F for ; Fri, 28 Oct 2016 04:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401AbcJ1Ec1 (ORCPT ); Fri, 28 Oct 2016 00:32:27 -0400 Received: from mail-dm3nam03on0040.outbound.protection.outlook.com ([104.47.41.40]:28960 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750914AbcJ1EcX (ORCPT ); Fri, 28 Oct 2016 00:32:23 -0400 Received: from BLUPR0301CA0009.namprd03.prod.outlook.com (10.162.113.147) by CY1PR0301MB1628.namprd03.prod.outlook.com (10.162.166.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Fri, 28 Oct 2016 03:45:53 +0000 Received: from BN1BFFO11FD044.protection.gbl (2a01:111:f400:7c10::1:139) by BLUPR0301CA0009.outlook.office365.com (2a01:111:e400:5259::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12 via Frontend Transport; Fri, 28 Oct 2016 03:45:52 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD044.mail.protection.outlook.com (10.58.144.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.679.5 via Frontend Transport; Fri, 28 Oct 2016 03:45:52 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9S3jA00026194; Thu, 27 Oct 2016 20:45:44 -0700 From: Yangbo Lu To: , , Scott Wood , Arnd Bergmann CC: , , , , , , , , Greg Kroah-Hartman , Mark Rutland , Rob Herring , Russell King , Jochen Friedrich , Joerg Roedel , Claudiu Manoil , Bhupesh Sharma , Qiang Zhao , Kumar Gala , Santosh Shilimkar , Leo Li , Xiaobo Xie , Minghuan Lian , Yangbo Lu Subject: [v13, 4/8] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 28 Oct 2016 11:32:30 +0800 Message-ID: <1477625554-46700-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1477625554-46700-1-git-send-email-yangbo.lu@nxp.com> References: <1477625554-46700-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131220999523879341; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5003940100001)(8936002)(2950100002)(33646002)(106466001)(229853001)(92566002)(19580405001)(50226002)(105606002)(19580395003)(7416002)(68736007)(50986999)(76176999)(6666003)(626004)(97736004)(575784001)(5001770100001)(86362001)(50466002)(48376002)(5660300001)(104016004)(77096005)(11100500001)(4326007)(36756003)(8676002)(87936001)(2906002)(85426001)(47776003)(81166006)(81156014)(8666005)(356003)(305945005)(586003)(7846002)(189998001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1628; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD044; 1:5nDqw0AQY0ayg2xeazypsyif4tMOG7xDkbtUVdpGWYF775IZIyLLoRnYupC1DpFpez+H882gCVQx+p+W429521MjHBJ0pMIovRQ6x6DHX0BWH6iI62C0UG6r3iSh3MBUsL0YAuACpscU3k1+MJpZVKrhG5ct1D00TyU4D8DbRlXnMegfHbmXJCuBSruSUdQvxncAG+HeI+hCuYe0AlfMRIo4BPM9/q3sAI1fW/M9b3ffiEDgnQZZ3TAit5hp7IIeJnaeEGj9UVBnhMZxiijZjIM92ZBIFf5ikO4QnzKvN1wVHCba7NcUUkdMo8owNYxJXR2mKKmwtzMJnqL79gP9lRqNPLN5rXz7LqnV/S6UXEWS6y1stchTE8ZOiWXQ010UzhkSVDp39Udg5JA+CrzY8oupR6RV3kiwsxubKRh7Y0nF/Xj93qk8BhTrVZh3/RoINGxX3dUp+PJi2DAY/EbGbKw11rvw5905voz+NPsaEuk6QEN9+ASNlf3/Rw7iBKYwve8xN+I4x6FKai+auad7D8Lju1DXZK6OJIsIUnFTwem/AP6iJ/eofgClAnGCyUKKPJ8NkSrNZaJFS+se39nvlToKpmqkb+jzHdcXADgHtlIQ3Feb/fW8lCcnNvP7NXA8vcu6dADXCrnTcAb5IJ1L1PFdZZQo7oyqWw4pDJF4+XB9jbrhQQQmDf8BYR285pekKM1dDZ18QFB+qbjlPpOylMWs59fYOPMulqPaEZ9bkTuSpPR80tdZltG6ho4tiJVp MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0f6fa168-0333-4ab5-e84c-08d3fee4ea25 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1628; 2:63dHIkXLrvB0NDTiBJ444YGb1FNbayLXXrtK4iVdu95vXSXgpHebpbH3EK2khAPI8Sf75QY9TPUy+v4NgB+7faG9u68kUhj7xHTL4mn8JZdgrM8SOUEZCtgDjKGt3F8zHDKfH+HGdZ9qztyBVXaFG8LvpS5gYV/+87mDXr++0xKDjtvgz5iOYbsPXDy7gIP2WwjyP30Rd4bI9jYPh1In3A==; 3:mCb2YD5KjMuX6CJHtS11dCDGoxv7vHlRSuoD88eJKGZDmFZPopjOlnjf3M5ZDQb4aPU1X8MH4D5cWgccy1lIxglC7nbKwPUu5EG75fYiZLPGUII6KlbYFQTvryS0pE02rNcLhJRWIRS/Jqvpq6J5BM3fTA2XUqUACokydLaDrbF7QZMLNp6ZgHCdskjvsQPQ9u3sOMfaQs0k+0boVNcCbwRkyLohGHwJzzfEISH5T53EDloz2x/w//ogBEeRJvSr; 25:mzUTBC/MxCmKlFQ3BP/RmJUMTX4ve4XRv3OzEfMgCVGcajMlwOYR+uxDCRpKXWAIuyTQKozsObavKs45TdevDfeojqVQEbEF3R2U1iSrgKsccffgnoKed1Wkp52yZR+BV5W4CW6yVwjLvuNMk6m0ZzgmUv8pw1B3EK1ZW2OAtL/VYqG3KoLzjhrlfWZPrQidmN2KHWAwRum3iidL7OMaVLUgml+wjXh2LERb06QCvos4Jg0uNTWwDIkkfaSakxv07Sj+11/SFisbKS9+l8EX+RZ1szFqouMJwICWzNztZUyqypjMDbNLS91A8cWQb75J99fb6CEQAogvBPya/NLd2XLxNBYrnmPZ9Mr+jd33pXGx0lZ9dtQQNscyBqy60lHqZks58IakXvHuTehrPiQzXhNRp3ns9pUM3E6hKv+Mao1RzUawbK5pDkVIgO4kxuu8jPNRk749n EQUC5F2saHEEw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1628; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1628; 31:mrLcRk6+2Kgt1Ei11ec3cv6XrBYSVDAeG89jIcL8jj9eEISqo9qmdzYxU3keXZNUc6qCwgBkFSudzAhvlyAAGVTCGc7OFMgOm1NzYdnVHDwEWDN1lR8u/gFlMsUD+RLAMcP1Ova0lKiBkmbhj89SBpc4BF4GzONT7GOCJ4PCRMQtPfkarv+bCQSiqB9fiHyvunRQfy5Jl6PbsiMK6QzytQV8myoiEihh0KXc6SfWeBoOY6PJscbekgNIkrRXmVowpTDpV5H83/4K6LwvEf4ZxnqU5DF3Emf9tvzFYmdaDNs=; 4:dPJrnuD/8JtJzygws7geHPComEqNrJuYbKzwF4tbiw8Y6EUzQV6bs6yZBXykDQAnbOXIujFWIR77iIwe+zRMv7Bdx9SlHMwCAVa84KPfW+ddlSZErmMudwxSsC2SMriMg4Cq6NkyXhSkCKrdb1M46o7vMwMFChbJRPmTqxdmuY6hw0n61bPSY4JRZzy0bfPCd2wSce1G0zOhoXNJfAXNPwFpN2CFYH0g7BaRVn8IdfSJe1GqIHNUY2s1IJANSnF2V73H61YFUywgShS8h4eFDDY8aTd1tUQQ6HhlGDU1Be4DAvZhjtu/Xa2H3T+8Pp4tvWd4jdT1pS4oYfJ4sV66vEs+VChmnkv79565WPWT8fs9iyO00tf2hB8ppVE6B1H9le7UOv+yhkvPNFb4757mCsemaZtLEyFih3mRCvkeQvnfEVVeJrjYH4sGjPq6GherFaPNfNWgIve6uq5xS/7vF2yMUFYOHuNQ4ETEuhG0S6YjBDS2jGVIHByZ04N5KF/bhf7pU95Vt3K/Thh3ZnINxCTTcCxmaaiNmGMja+CJBhG3nOjOIxVWDH6rlTGull6n X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13018025)(13024025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB1628; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1628; X-Forefront-PRVS: 0109D382B0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1628; 23:pxc3ngku+JuaD+feNfX3bW57N4Hp4qw4ZaicGrE?= =?us-ascii?Q?8RhPBz1MSeEXH8WMMzpmrZozjrSlG2dbBkQJLZCJe9QETIT073PgB6WOO+Ep?= =?us-ascii?Q?cfrgOJh4hEjPMwC6nn6Jy0iNUbuTFuNxqzpMWeX6oNP2bt1g7UY2sY0LwWJ3?= =?us-ascii?Q?Lp7sghEyJcVzFFvcL0iQ4OKFusBz5ax7QSQHft/YGiYbLKYTg4oTR9X50t9S?= =?us-ascii?Q?jOedvajzFI9+GfDbF+FFo1qEoKbNMtnQm+v4zfgvtR+snpMoJrkRbsw8Y931?= =?us-ascii?Q?fkrXfFT1MK23s4oBwVvQR4G8vCy7lxbMzcSlcEFKyLJpg8L/OgBbAqqi4Ikt?= =?us-ascii?Q?KzAG+HCGTGqNpfnLJIqC1SDVW+DIV74mxfAhNO7aTg9U4+XA8RBw1D8yf4qU?= =?us-ascii?Q?VDuQDg51HX7bu1n+yGK9TuOaRg859LnOZH0hMvxCQDUWbDg4NUj/Up1+5Bqp?= =?us-ascii?Q?y5RGLallD70RnMZ7MenEC7RdIpdRowQj2pGf+/2o9c6i9ny6XvFXX1/ZY4gM?= =?us-ascii?Q?4cV7HvGc3eeGcqpsMgyhBQ2IosPPXsLoL33uDoKL2U/1LvY+3X9388I5m2LH?= =?us-ascii?Q?N7ue+EXNj97xfgabAYFgAKaVwF1ohz23JVqZjEVfpICBjnUa3WvJAhdzODAB?= =?us-ascii?Q?MU5nP3P4+7TdMlipqNHvSfAQaGL3379mHwFrIhBqT8BvC5nG0wqXA8jzImYh?= =?us-ascii?Q?6G19/2FH1kR4/7Fa1jDuskYC+VIlZmjF5uXazRD6dQTle6j9DBCcOMgfPq7j?= =?us-ascii?Q?sPNzx5efoto8+KZg3r9N7rXvRPAtEM4nYoGbLUkY9o0CxXDt4bHjxxxBd49T?= =?us-ascii?Q?TrFuM/2ByiIUeGfD5kDfUKLVtEKXdS9AeSUpuBk9OYN/WQ0SWqnvuCrc5ZRG?= =?us-ascii?Q?FyzZdWeQ3vbABbW+hNiLKV9Qy2dzNs9UJkD2Xkfu0GzAWirIFAAB0VWCn1QY?= =?us-ascii?Q?4wYdUreiAxdNXMG5sReCjtAYTthKpA6PAAUdppRmzipmRFu8idg58Qbo0EZP?= =?us-ascii?Q?mvfWLMsYSzBCbwedB4k10GefX86Yld/pib7v3I3ihF8R2ViOODYi8A+WdQsr?= =?us-ascii?Q?PMvLZOsmRTCSMTmiFDrQLNi5LIbOfHbtV3H91WxrvmxiLcrY7zg4QVc/LhXf?= =?us-ascii?Q?cT87yX0hhqKSoLonG8XH8Bo+LJpi27KrBUizwxnLawGQA1z+iemZn47l43co?= =?us-ascii?Q?hmHyvgMcngEJzRZHO662ZumO7nvhhYgrlEc+mlIw3a26cBuuOmmtP+rDzeA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1628; 6:IGFWhFIX9K3+qnFWjLQ1AvWhcirU4rjuIDD+K2+d95gNnsNVFfkS2uhHtm1HJlNQEiICx04afjD/MW4d7nrb3oXCNvFR9r50tgnPM07tBHvU/T/TM0/pBJ3MA9fXnOFodpsWSJhDQq8HJKXtowcr/n1cpEXSv2GuTmj8s5KM4BhETphfISULKRBfiDsshvE045b0ACeXayHbRwLc6ewkDJW2tTMn3tVAMKMGMQnwuxqPpNFEqwwIy7FqfZP0z7XFYamfqrf4jKwgqYZBECNnkcUztgGTAuQ6Uqz9CYVYnGpaGcVd9tTCwsUUxutQBMog; 5:53KTpk13VZzN51LtjDmqHYPFOM0Xo9eRbVvHvwtGLu4gzwmtdYmMJq9Z0v/QjbaazUzXKxJT4fd6GopIt4ey0f/J9fB9Gx2KU/3nVJYGcwajt9JrP0l0itD/MDCzUA93Udm6U6d9ngS+VKF9ZyZ+xKOg+3CICDyrzjJughimw78PtZYmhAu5FcdVptVbGO1H; 24:AMllKsvEa6+6IJYJJKb/+DcPB1JUusONsAIBC7+xsKMvJkou6a7LM8DsJTgb5RwN8FQ1hh7Vh4azYkULwaLK0j6wZUux4YZ5YaDVv2kvjTk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1628; 7:WVE0V+zPMq8HiaNF3JR30SAlS4jF+97NAdRrbwmDy/oYSa4XbUyyRlDBLbH3n2DB5KhNlQNTtTMo9emXqAMm5usAw1K/5lyRF7mx/1uCAA2L51XeBaBiMIDSP+ayh4G/N8/zhVt1iOkBN1xi9b1e7IyTBAcMfSfvx5g7MR6Zp/rgx9JkTqDdb0GMkqZGuXa6xLFhxO2F/f7+3XH0Y3mNd+ofQFjRDJmxEmSBs/6XSvcCFIyn1rK1g0SVmb4sAWvoPKfkNsvXwzEHwYkwrVoN01wpPP0CtTVqU6Dxt9mculbZ7K7FmiMrkasDMyXUwmAxSXSund3lmKOdgs6yz3T31ftgRz1QZhoH6SqVQJQmjPc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2016 03:45:52.0915 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1628 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move mpc85xx.h to include/linux/fsl and rename it to svr.h as a common header file. This SVR numberspace is used on some ARM chips as well as PPC, and even to check for a PPC SVR multi-arch drivers would otherwise need to ifdef the header inclusion and all references to the SVR symbols. Signed-off-by: Yangbo Lu Acked-by: Wolfram Sang Acked-by: Stephen Boyd Acked-by: Joerg Roedel [scottwood: update description] Signed-off-by: Scott Wood --- Changes for v2: - None Changes for v3: - None Changes for v4: - None Changes for v5: - Changed to Move mpc85xx.h to include/linux/fsl/ - Adjusted '#include ' position in file Changes for v6: - None Changes for v7: - Added 'Acked-by: Wolfram Sang' for I2C part - Also applied to arch/powerpc/kernel/cpu_setup_fsl_booke.S Changes for v8: - Added 'Acked-by: Stephen Boyd' for clk part - Added 'Acked-by: Scott Wood' - Added 'Acked-by: Joerg Roedel' for iommu part Changes for v9: - None Changes for v10: - None Changes for v11: - Updated description by Scott Changes for v12: - None Changes for v13: - None --- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- arch/powerpc/sysdev/fsl_pci.c | 2 +- drivers/clk/clk-qoriq.c | 3 +-- drivers/i2c/busses/i2c-mpc.c | 2 +- drivers/iommu/fsl_pamu.c | 3 +-- drivers/net/ethernet/freescale/gianfar.c | 2 +- arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h | 4 ++-- 7 files changed, 8 insertions(+), 10 deletions(-) rename arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h (97%) diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 462aed9..2b0284e 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -13,13 +13,13 @@ * */ +#include #include #include #include #include #include #include -#include _GLOBAL(__e500_icache_setup) mfspr r0, SPRN_L1CSR1 diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index d3a5974..cb0efea 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 20b1055..dc778e8 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1153,8 +1154,6 @@ static struct clk *clockgen_clk_get(struct of_phandle_args *clkspec, void *data) } #ifdef CONFIG_PPC -#include - static const u32 a4510_svrs[] __initconst = { (SVR_P2040 << 8) | 0x10, /* P2040 1.0 */ (SVR_P2040 << 8) | 0x11, /* P2040 1.1 */ diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 565a49a..e791c51 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -27,9 +27,9 @@ #include #include #include +#include #include -#include #include #define DRV_NAME "mpc-i2c" diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index a34355f..af8fb27 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c @@ -21,11 +21,10 @@ #include "fsl_pamu.h" #include +#include #include #include -#include - /* define indexes for each operation mapping scenario */ #define OMI_QMAN 0x00 #define OMI_FMAN 0x01 diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 4b4f5bc..55be5ce 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -86,11 +86,11 @@ #include #include #include +#include #include #ifdef CONFIG_PPC #include -#include #endif #include #include diff --git a/arch/powerpc/include/asm/mpc85xx.h b/include/linux/fsl/svr.h similarity index 97% rename from arch/powerpc/include/asm/mpc85xx.h rename to include/linux/fsl/svr.h index 213f3a8..8d13836 100644 --- a/arch/powerpc/include/asm/mpc85xx.h +++ b/include/linux/fsl/svr.h @@ -9,8 +9,8 @@ * (at your option) any later version. */ -#ifndef __ASM_PPC_MPC85XX_H -#define __ASM_PPC_MPC85XX_H +#ifndef FSL_SVR_H +#define FSL_SVR_H #define SVR_REV(svr) ((svr) & 0xFF) /* SOC design resision */ #define SVR_MAJ(svr) (((svr) >> 4) & 0xF) /* Major revision field*/