Skip to contentSkip to conversation

ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

PATCH New Mark Brown 2 participants 5 messages Jan 21, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

Avoid relying on implicit inclusion of machine.h

Signed-off-by Mark Brown <[email protected]>
Cc stable at kernel.org
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -0
index c8a84be..e7b40ba 100644
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/smsc911x.h>
 #include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 
 #ifdef CONFIG_SMDK6410_WM1190_EV1
 #include <linux/mfd/wm8350/core.h>
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

Quoted 13 lines · Mark Brown

Avoid relying on implicit inclusion of machine.h

Signed-off-by Mark Brown <[email protected]>
Cc stable at kernel.org
---
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/mach-smdk6410.c +0 -0
index c8a84be..e7b40ba 100644

arch/arm/mach-s3c64xx/mach-smdk6410.c line 31

Quoted 4 lines
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -0
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/smsc911x.h>
 #include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>

Why is this a -stable patch? Is the build broken somehow right now in a released kernel without this patch?

confused,

greg k-h

author
#2 lore raw

PATCH 1/1 ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

Quoted 6 lines · Greg KH
Quoted 1 line · Mark Brown

+#include <linux/regulator/machine.h>

Why is this a -stable patch? Is the build broken somehow right now in a released kernel without this patch?

I believe the build breakage affects existing released kernels with the appropriate set of configuration options chosen (1192 enabled and 1190 disabled), yes. This is a pretty obscure combination so it's unlikely anyone will run into it in practice.

#3 lore raw

PATCH 1/1 ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

Quoted 5 lines · Mark Brown
Quoted 3 lines · Greg KH
Quoted 1 line · Mark Brown

+#include <linux/regulator/machine.h>

Quoted 7 lines
Quoted 2 lines

Why is this a -stable patch? Is the build broken somehow right now in a released kernel without this patch?

I believe the build breakage affects existing released kernels with the appropriate set of configuration options chosen (1192 enabled and 1190 disabled), yes. This is a pretty obscure combination so it's unlikely anyone will run into it in practice.

Ok, then it probably shouldn't be a -stable patch :)

thanks,

greg k-h

author
#4 lore raw

PATCH 1/1 ARM: SMDK6410: Fix build with WM1190 disabled and WM1192 enabled

Quoted 8 lines · Greg KH
Quoted 4 lines · Mark Brown

I believe the build breakage affects existing released kernels with the appropriate set of configuration options chosen (1192 enabled and 1190 disabled), yes. This is a pretty obscure combination so it's unlikely anyone will run into it in practice.

Ok, then it probably shouldn't be a -stable patch :)

Oh, OK. It seemed like it was sufficiently safe to make the risk/value for the change reasonable.