[PATCH] acpi: fix acpi/video.h error and warning when PM is not enabled

[PATCH] acpi: fix acpi/video.h error and warning when PM is not enabled

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

When CONFIG_PM is not enabled, acpi/video.h causes a build error.
Also fix a longstanding warning.

include/acpi/video.h:22: warning: 'struct acpi_device' declared inside parameter list
include/acpi/video.h:22: warning: its scope is only this definition or declaration, which is probably not what you want
include/acpi/video.h: In function 'acpi_video_get_edid':
include/acpi/video.h:24: error: 'ENODEV' undeclared (first use in this function)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 include/acpi/video.h |    4 ++++
 1 file changed, 4 insertions(+)

--- lnx-2637-rc2.orig/include/acpi/video.h
+++ lnx-2637-rc2/include/acpi/video.h
@@ -1,6 +1,10 @@
 #ifndef __ACPI_VIDEO_H
 #define __ACPI_VIDEO_H
 
+#include <linux/errno.h>
+
+struct acpi_device;
+
 #define ACPI_VIDEO_DISPLAY_CRT  1
 #define ACPI_VIDEO_DISPLAY_TV   2
 #define ACPI_VIDEO_DISPLAY_DVI  3

Re: [PATCH] acpi: fix acpi/video.h error and warning when PM is not enabled

[Zhang Rui]

On Wed, 2010-11-17 at 08:59 +0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> When CONFIG_PM is not enabled, acpi/video.h causes a build error.
> Also fix a longstanding warning.
> 
> include/acpi/video.h:22: warning: 'struct acpi_device' declared inside parameter list
> include/acpi/video.h:22: warning: its scope is only this definition or declaration, which is probably not what you want
> include/acpi/video.h: In function 'acpi_video_get_edid':
> include/acpi/video.h:24: error: 'ENODEV' undeclared (first use in this function)
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

we already have a patch at
http://marc.info/?l=linux-kernel&m=128369371631933&w=2
Not sure if Len has applied it or not.
Anyway, thanks for the patch. :)

-rui
> ---
>  include/acpi/video.h |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> --- lnx-2637-rc2.orig/include/acpi/video.h
> +++ lnx-2637-rc2/include/acpi/video.h
> @@ -1,6 +1,10 @@
>  #ifndef __ACPI_VIDEO_H
>  #define __ACPI_VIDEO_H
>  
> +#include <linux/errno.h>
> +
> +struct acpi_device;
> +
>  #define ACPI_VIDEO_DISPLAY_CRT  1
>  #define ACPI_VIDEO_DISPLAY_TV   2
>  #define ACPI_VIDEO_DISPLAY_DVI  3
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] acpi: fix acpi/video.h error and warning when PM is not enabled

[Randy Dunlap]

On 11/16/10 17:29, Zhang Rui wrote:
> On Wed, 2010-11-17 at 08:59 +0800, Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> When CONFIG_PM is not enabled, acpi/video.h causes a build error.
>> Also fix a longstanding warning.
>>
>> include/acpi/video.h:22: warning: 'struct acpi_device' declared inside parameter list
>> include/acpi/video.h:22: warning: its scope is only this definition or declaration, which is probably not what you want
>> include/acpi/video.h: In function 'acpi_video_get_edid':
>> include/acpi/video.h:24: error: 'ENODEV' undeclared (first use in this function)
>>
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> 
> we already have a patch at
> http://marc.info/?l=linux-kernel&m=128369371631933&w=2
> Not sure if Len has applied it or not.
> Anyway, thanks for the patch. :)

Good.  Thanks for the info.

> -rui
>> ---
>>  include/acpi/video.h |    4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> --- lnx-2637-rc2.orig/include/acpi/video.h
>> +++ lnx-2637-rc2/include/acpi/video.h
>> @@ -1,6 +1,10 @@
>>  #ifndef __ACPI_VIDEO_H
>>  #define __ACPI_VIDEO_H
>>  
>> +#include <linux/errno.h>
>> +
>> +struct acpi_device;
>> +
>>  #define ACPI_VIDEO_DISPLAY_CRT  1
>>  #define ACPI_VIDEO_DISPLAY_TV   2
>>  #define ACPI_VIDEO_DISPLAY_DVI  3
>> --


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***