Skip to contentSkip to conversation

ARM: mmp: include the correct cputype.h

PATCH In review Arnd Bergmann 3 participants 3 messages Dec 10, 2019 – Dec 13, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: mmp: include the correct cputype.h

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/")
---
 arch/arm/mach-mmp/pxa168.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-mmp/pxa168.h +1 -1
index 6dd17986e360..34f907cd165a 100644
@@ -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;
Signature · 7 lines
2.20.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Arnd Bergmann

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/")
Quoted 19 lines
---
 arch/arm/mach-mmp/pxa168.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-mmp/pxa168.h +1 -1
index 6dd17986e360..34f907cd165a 100644
@@ -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;
#2 lore raw
Quoted 7 lines · Lubomir Rintel
Quoted 5 lines · Arnd Bergmann

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

Quoted 6 lines
Quoted 4 lines

Include it from the new location.

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

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

Thanks!

-Olof