From patchwork Fri Oct 28 06:50:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9401349 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 41DED605EE for ; Fri, 28 Oct 2016 07:05:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EE432A5D0 for ; Fri, 28 Oct 2016 07:05:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 234A62A5D2; Fri, 28 Oct 2016 07:05:25 +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 74EB92A5D0 for ; Fri, 28 Oct 2016 07:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965646AbcJ1HDl (ORCPT ); Fri, 28 Oct 2016 03:03:41 -0400 Received: from mail-sn1nam01on0087.outbound.protection.outlook.com ([104.47.32.87]:60736 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965129AbcJ1HDd (ORCPT ); Fri, 28 Oct 2016 03:03:33 -0400 X-Greylist: delayed 3900 seconds by postgrey-1.27 at vger.kernel.org; Fri, 28 Oct 2016 03:03:32 EDT Received: from BN3PR0301CA0022.namprd03.prod.outlook.com (10.160.180.160) by CY1PR0301MB1625.namprd03.prod.outlook.com (10.162.166.27) 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 07:03:30 +0000 Received: from BN1AFFO11FD056.protection.gbl (2a01:111:f400:7c10::179) by BN3PR0301CA0022.outlook.office365.com (2a01:111:e400:4000::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12 via Frontend Transport; Fri, 28 Oct 2016 07:03:30 +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 BN1AFFO11FD056.mail.protection.outlook.com (10.58.53.71) 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 07:03:29 +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 u9S72smd019535; Fri, 28 Oct 2016 00:03:21 -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: [v15, 3/7] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 28 Oct 2016 14:50:14 +0800 Message-ID: <1477637418-38938-4-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1477637418-38938-1-git-send-email-yangbo.lu@nxp.com> References: <1477637418-38938-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131221118099598462; (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)(11100500001)(33646002)(5003940100001)(47776003)(4326007)(626004)(87936001)(85426001)(2906002)(7416002)(229853001)(5001770100001)(8666005)(97736004)(575784001)(86362001)(106466001)(189998001)(50226002)(305945005)(50986999)(105606002)(76176999)(356003)(104016004)(19580405001)(7846002)(8936002)(92566002)(5660300001)(48376002)(50466002)(77096005)(586003)(81156014)(81166006)(36756003)(8676002)(2950100002)(6666003)(68736007)(19580395003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1625; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD056; 1:mIXk+t5s1a/cjLY77O9etB3VqcG53ymR0CFhSE3yzo+3zXi0NSiaNRQFvMonlrQbKmE38bZoCc1wiXnLJ0HMx3+y9MuUwPsqyUHI2TdWJudz+keyLORWofvksnVs5z0olM1ImNgouAeKCvcqbfVxk/W41GoeueP79qpBAKrZCKu7PQSqLg0iXWQQVlH/WOO81CbIfu5RSuk7g68bg7Ptxu5UtVtoCijNaW0SpZha9ndV2XRMbBsfYoIQ/nLqpdfn5AB6OpLQh/8V4NdhaaizlmwgLyNfcQwQywFcsgIO+D2GAMKANI8pms4B/tfynEoNfwIRc8L44HuuqMV+Z7qxECbj3SrjW2jfZaDM3WadQJQ49tZZmHhj308N2GxdJiRHIlu3HTxTojdPmJhwKyUdTdeUTlCVIKPteUJ7c5PcwlEOEk7P5CTEQUQY/pPQ9CsA6FRes4nvOcRc2WmrVN/6AgTJbTWS59PxqHLvBZ6cpWaf3x8dw247eSeEJ6wAkyefEovF9ljctSBvv7W3IYAk01/IsvrkXWy0u2cXv3rWknvnA4l8HFJm/T75ZLcrcDds0HjOGXvuTmVQ0t2lu2siLZ8TkiMSnsi03SX01UiBfN+DcCBcZ8nhOxCgBC3hHCo57IFRmMmlUdal7pBTAk8yup/O3uI/+eK+6VRzOWEtkgMqN6mGw5KO4Bt0LlYWXLkwxTdIdiNXW0hoOz0ubevoQaFds2XA+LOuDO8s6YEpOuYV16lyUnyeB6ucX7vnXLGH MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a642ed91-4d1b-4fdc-2c7e-08d3ff0085d2 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1625; 2:xF55ad5CCh+PXP/srACeT3/erNUnhN+VMtMpDBZDyn1J8lCYmNuiewCJu7WCnkTG1lSYVN+zLjSv814jtkvaramw4ApGCYVWnJtmnagZufny0O7KOjYtUGImUdNuj1U0Ox8se0Iq3+5brkppmm+oCki8Ga//pvCw9hfb7TU0Fh/BGkgj1ChY7fB5OeN7G/Ek2YVTmnm39aNvt/mQdS3Ldw==; 3:a3hmc0m3+3MSxOHYj4Z95d67jFYmQ2LEKBqtLdwPOakwsr9GigzWaGHDof+zFIce3ehRPjsk1eHKXAXS0+UO6b1MnE8QK8BRG37daGqXIx+Hz4kCVETLgIfdjQObwa8YlSX7vXO/h6Iwu/5lglGWl0M/Rr5Wf4rFAVGLSKpsx8dMUTs+s/nXWQO+Kj2yIpNndv0IS8vjsIUrg/EtPJyAWAs4KU0pe/igjfq72NSPZP+bN2C0adUG3Kx+QxPaXEar; 25:BJEwksmRyr2FXttWYCIzmsEmB4COHmRDwOOQbEpbSURFiZedLk4deNPlq74q8x26zgWcBW0ZJNjI9zToJ3VfzCjDUv7BoZ60XKxG+3KsoeS3ndODRF7F+qI6uIV6JKtEOg00HvqA+1wlkCi1nLUtERDCn3VdFZmydDT+AxU+qnkdYNhrBm+yvNGIgRss6qxZpMqjdY881u/mFz2O77tEH3/twvqvEYRFa+YksUeIS6cfC+cyhX/87/zb+aJ08dEYq3jzBflSdeocjdA1n0knIsVJRWEujViy+KxlLMMiooQ19XpGjpz51Na7Yv28TEoGEJjBlsF8mQgAVgYn1y+fKJbX7UoqCSASUhnYcjgSELY8wBhQjWKS8tY8Zzes2pGB6PIVEeZNJzs3iinLUnNuLDWo1s/Z9QsAnh0Y48Y6b/cMnm+R4H6MzjbqAOXqewRWzTUJRHpgv SpGRIM/iQgpbw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1625; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1625; 31:UOLNO/sFafoDcM5Fw1F53rsjm6MQicONm1rzjYi8vkFQzsAt5RCumuW0T28YeHw6KLCwIgR9/8mz2qDylfp3AO/cM3MveKf/PUH+VwGz2OD2V1nX3fOsbJSxBCd43oyUjy75ebmeuQVMBoC1e3u94IBeNi+ldaUIOykxgJz+kRiX2l2/bILhFSIALSFA39bcz65fIrGFfusj/JhxSM0JTXP1c1Q0lDYhuTajPGjWVrjt9dUthAENkcY8HcHvhQoZUVQwsFmbtjlwRLSCElDpLjUwMebkmt7zqicaUweuZ5I=; 4:rrJmDobz4KQNwSH6de/0clNplx7QlIpAZlnm9BhPHvgSblQ/Xu2Unm6Xtt50XjkToVPk+F5nf+DmcnPAJJ8seaHVEWvsUTQuX6EaDFSl2cfnn4u8/PDmhdDV/STnBLrVTH6L1DZ5RX1HCFlRk5/FsX5zNzpqfiMLmmGBorLbDWEPenbQ9tDpXXdz5WukavbxnEDe+FtrkOcvpoeIplAkjE1QcSDdOLo15lruPVVR0jhZt4FQhpLjoR6WLJhfl3WZws+hWC5ncUNhIs8h7LzaU7Htm9fb/81Hurx2k6fJqTzqmO/LJMc4504l2s2zffEYcG/hv4Nyduzs7HYd+8jSz0N3KoHqmGViY7Y4GbTo1R8t5p+tWDigyUqGOkfyiSkNzHsA5w1MIZLbpIT8ocCfoV0vNGlwtpQlwRusak/Xc4hsSduxyST7P72y51OfUGC7JgyIPBZtuTRSjkeWWlDOHB65nnHilIJJEzZErR2FvmPclZC8CUrM72XPbBNvrz0U4YRzXEpN4G0U+pYd1B6h83rA2MYtElI+F5fLDAY9Ynp6jY5flciu2Xsssm6scqRZ 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)(8121501046)(13024025)(13017025)(13018025)(5005006)(13023025)(10201501046)(3002001)(6055026); SRVR:CY1PR0301MB1625; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1625; X-Forefront-PRVS: 0109D382B0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1625; 23:quPlagrHa3VRLmUNEdDAj2X+gwuFFRNlv6HNzla?= =?us-ascii?Q?+PYgwcCaAIgYBim//zZfrqlqqf1qD1fj+JTjt8xe4dinbhIoSk3q0vWFGRvU?= =?us-ascii?Q?ChNYBxa2jZ6TX3uDtoBhuNEW8JCH4Ao7ScgcPW1SQ9Y28em/U/GQuyb59UYe?= =?us-ascii?Q?CSRM3D6gzO7zFlOToe54S+4PAYWeejx2rE2yyYfyOheTbZsQ8rS0jIWXqZrF?= =?us-ascii?Q?soCJV5C5L5KIKnYangfVkz6DcDtnPpEqLnsGbwGK1L4TDv31siDWTXYFwwzj?= =?us-ascii?Q?fXuWeQKcSXgwss+DoxEAGD1T/xruDHjP6w7fHv56In1XdgFA5OPOIoLXHJs9?= =?us-ascii?Q?e0CtgjygdlNJZr2f3ZsbXnkd40Wv/KVmzvtjAaD0KRLfUXZGIEM0zF5xtdv2?= =?us-ascii?Q?ss66uK1HujetVqC1Oe4sTVTnh4ysqMhE8zTnBy7gwDch+fNVYVNjTv0w3MNm?= =?us-ascii?Q?BbcPAmUbJ86NxxRrj5b6sDwq8wbpCqEyUzdOmBq1VkEYGBl/EfoB8ItESdcY?= =?us-ascii?Q?j5lGsOWANk7H5+ictln9EBfUGuJtnPZoB//P3LgELJ9fStk/DKxAcWEe9HF9?= =?us-ascii?Q?0Qm3uPCmU8qx5TLz6nE9z4WFS+axJnxOHE0ILXfrlh5wJDctMNXCjV71+/NA?= =?us-ascii?Q?w/+C0j/GE57oSa9Q9QKHUNSFAlSP+eLo6AAi5CLpbxVOh580yOGIRhjrwt+O?= =?us-ascii?Q?C/KHN4lECoDfDwZiF/BhL+j58b9VmBay0N33NK9LZ3H4eTdborjnmM6y55br?= =?us-ascii?Q?x65QpI2l3m+A2DuP2SyEDssGqIntRwYB2Ty3AmOBI8643Zy8foi2Rcp0ifl3?= =?us-ascii?Q?HwHshLSvE7ccfm21Cydnn7FqW0GViVyTPXZbanLMqngeJqAvmMok1XhA7aKh?= =?us-ascii?Q?qiijRuPmNAMj102UZjFCnvRBKJOSadn8VYPY+JeNb7ozmJmivLmGRLHjJi7Q?= =?us-ascii?Q?Emx8e2mThowzK5lKYj2wcFR+nOAYEPjdDeSXq7Dq5BpC0f05yPvDnHanIKi/?= =?us-ascii?Q?ypyiVH5mrT4LABKu5e75f3nUjSI1hQ8bvo+F7Q7n/wWAKoRRNAH+AoKs94ul?= =?us-ascii?Q?MZUOQXuU3woPxevjxyiE2e8IFZ1fkkm1ke7MI0/hX17FRhpaPVy/Jb1UENy3?= =?us-ascii?Q?gNAF8fNUaW5Ek1lDZFjvQ3ajAhcwGZUdTnxFdRaIZMo3+ENoR8f6hivKEClw?= =?us-ascii?Q?jWgNwjPoSKMqEp50yPLU874EA44sNw8ClNpQgDbdvRvZJJ/dY4YSbv9PnwA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1625; 6:zz4PsRnMd27iKZyZ2tDwh2Oj+f88Hwgznu+qG8viJIFnBoeFV1vxnUEj47ICtouUuYYBdIR6xeMYJTOCywW8rSzi1cF8OXILlVGWEFZ5Z80xl9f2vg7UZyjKFbCExwtCFe/e/AC83bD1LxZoaf492GZbvEuKv09awwHnkLD6fdcYbaCy3ow/h2giDFWsTgFZrRbZZu3wQcmCtMZWw7Aox20+JmtpomDdx+NxKHcDLQxnYW2gKljGdWimfC3lxyX1hbn+g8mxNTBwuYBE3ZCfe4w3SC11nFbADLdVk5rOeZFiEltb7PH8UNJ0LLq+Wmgc; 5:cM4PvnWdPK23uERK9jHaHy1oE0Vp11c6AIp5872mFt/O6a/UWCtWP+ueOBjJGNA5abyXt59sdFbJT+t7weXRFpbpFQ7plEgYPM8hByn1/xg/tUzua2PEx0RrR5gZsuuq+QvZhxUOUjD/UpVF50HkLQeBwrneHwoGKpT2QYa27ZYJBel8iwl8RxSJLMnbBYQ5; 24:pliVnzgfsg5IEstg8CY9HWvF2ndZBGgLqeq4hBna+quxK5YXx8oSh1gGfXwDrGvf2RwG9D31fqdXeTICJYQub6YTbxbdZaDZXLvyZ0JSiLw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1625; 7:1c86z0ule67LNAwJUvsjx+37k5G/Z5IrKTvzs6MzYtPdXG80NA3v4Iw6P9iZDkTf3n2mPlQ+wNSuUOUth8BXNoROIti5Esve8uiPZvOOEvgdQ7swJ6H6mMoEG/ajM/U8fnocdo+bVhYbbbpQ7xOCfHU6xrs4PBE4fJgnAagUARtiGgTrxLhOsFt38I3XwMQiEKuHeLbcaMAQXjsO2jHFWVLj0fmgmbs7Xed78Vwqe9jP0MHbw6QFfD16tf3wx30GraPaLoU+8wnMr6x93tu48LLSVj01jvUU+fwZUj+i5MfrppEeC/Y73pMhDEpI5McHWXI5DgTXsUjOKMJFjBgQ2O4sor556jOe1GvzK44dWOk= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2016 07:03:29.6322 (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: CY1PR0301MB1625 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 Changes for v14: - None Changes for v15: - 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*/