lkml.org 
[lkml]   [2010]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: linux-next: build failure after merge of the acpi tree
    Date
    On Thursday, December 02, 2010, Stephen Rothwell wrote:
    > Hi Len,
    >
    > After merging the acpi tree, today's linux-next build (powerpc
    > ppc64_defconfig) failed like this:
    >
    > In file included from drivers/video/output.c:25:
    > include/linux/video_output.h: In function 'video_output_register':
    > include/linux/video_output.h:49: error: implicit declaration of function 'ERR_PTR'
    > include/linux/video_output.h:49: warning: return makes pointer from integer without a cast
    > In file included from drivers/video/output.c:27:
    > include/linux/err.h: At top level:
    > include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
    > include/linux/video_output.h:49: note: previous implicit declaration of 'ERR_PTR' was here
    > drivers/video/output.c:84: error: redefinition of 'video_output_register'
    > include/linux/video_output.h:44: note: previous definition of 'video_output_register' was here
    > drivers/video/output.c:114: error: redefinition of 'video_output_unregister'
    > include/linux/video_output.h:51: note: previous definition of 'video_output_unregister' was here
    >
    > Caused by commit 16d21716c8849c3283d1b9e590e6fe8d1966f4b7 ("ACPI: video:
    > fix build for VIDEO_OUTPUT_CONTROL=n"). See Rule 1 in
    > Documentation/SubmitChecklist.
    >
    > I have used the version of the acpi tree from next-20101201 for today.

    Something like this will help, perhaps:

    ---
    include/linux/video_output.h | 1 +
    1 file changed, 1 insertion(+)

    Index: linux-2.6/include/linux/video_output.h
    ===================================================================
    --- linux-2.6.orig/include/linux/video_output.h
    +++ linux-2.6/include/linux/video_output.h
    @@ -23,6 +23,7 @@
    #ifndef _LINUX_VIDEO_OUTPUT_H
    #define _LINUX_VIDEO_OUTPUT_H
    #include <linux/device.h>
    +#include <linux/err.h>
    struct output_device;
    struct output_properties {
    int (*set_state)(struct output_device *);

    \
     
     \ /
      Last update: 2010-12-04 00:55    [W:0.022 / U:0.284 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site