ARM: mmp: include the correct cputype.h

Message ID 20191210203409.2875880-1-arnd@arndb.de
State Accepted
Commit 8ecad8c0d1f87d3912c5ce9b65c56c32a38ac527
Headers show
Series
  • ARM: mmp: include the correct cputype.h
Related show

Commit Message

Arnd Bergmann Dec. 10, 2019, 8:34 p.m.
The file was moved, causing a build error:

In file included from /git/arm-soc/arch/arm/mach-mmp/pxa168.c:28:
arch/arm/mach-mmp/pxa168.h:22:10: fatal error: cputype.h: No such file or directory

Include it from the new location.

Fixes: 32adcaa010fa ("ARM: mmp: move cputype.h to include/linux/soc/")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/arm/mach-mmp/pxa168.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Lubomir Rintel Dec. 13, 2019, 8:32 a.m. | #1
On Tue, 2019-12-10 at 21:34 +0100, Arnd Bergmann wrote:
> The file was moved, causing a build error:

> 

> In file included from /git/arm-soc/arch/arm/mach-mmp/pxa168.c:28:

> arch/arm/mach-mmp/pxa168.h:22:10: fatal error: cputype.h: No such file or directory

> 

> Include it from the new location.

> 

> Fixes: 32adcaa010fa ("ARM: mmp: move cputype.h to include/linux/soc/")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Acked-by: Lubomir Rintel <lkundrak@v3.sk>


> ---

>  arch/arm/mach-mmp/pxa168.h | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/arch/arm/mach-mmp/pxa168.h b/arch/arm/mach-mmp/pxa168.h

> index 6dd17986e360..34f907cd165a 100644

> --- a/arch/arm/mach-mmp/pxa168.h

> +++ b/arch/arm/mach-mmp/pxa168.h

> @@ -17,9 +17,9 @@ extern void pxa168_clear_keypad_wakeup(void);

>  #include <linux/platform_data/keypad-pxa27x.h>

>  #include <linux/pxa168_eth.h>

>  #include <linux/platform_data/mv_usb.h>

> +#include <linux/soc/mmp/cputype.h>

>  

>  #include "devices.h"

> -#include "cputype.h"

>  

>  extern struct mmp_device_desc pxa168_device_uart1;

>  extern struct mmp_device_desc pxa168_device_uart2;
Olof Johansson Dec. 13, 2019, 6:31 p.m. | #2
On Fri, Dec 13, 2019 at 12:41 AM Lubomir Rintel <lkundrak@v3.sk> wrote:
>

> On Tue, 2019-12-10 at 21:34 +0100, Arnd Bergmann wrote:

> > The file was moved, causing a build error:

> >

> > In file included from /git/arm-soc/arch/arm/mach-mmp/pxa168.c:28:

> > arch/arm/mach-mmp/pxa168.h:22:10: fatal error: cputype.h: No such file or directory

> >

> > Include it from the new location.

> >

> > Fixes: 32adcaa010fa ("ARM: mmp: move cputype.h to include/linux/soc/")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

>

> Acked-by: Lubomir Rintel <lkundrak@v3.sk>


For some reason patchwork didn't reply to this, but I applied it a
couple of days ago.


Thanks!

-Olof

Patch

diff --git a/arch/arm/mach-mmp/pxa168.h b/arch/arm/mach-mmp/pxa168.h
index 6dd17986e360..34f907cd165a 100644
--- a/arch/arm/mach-mmp/pxa168.h
+++ b/arch/arm/mach-mmp/pxa168.h
@@ -17,9 +17,9 @@  extern void pxa168_clear_keypad_wakeup(void);
 #include <linux/platform_data/keypad-pxa27x.h>
 #include <linux/pxa168_eth.h>
 #include <linux/platform_data/mv_usb.h>
+#include <linux/soc/mmp/cputype.h>
 
 #include "devices.h"
-#include "cputype.h"
 
 extern struct mmp_device_desc pxa168_device_uart1;
 extern struct mmp_device_desc pxa168_device_uart2;