linux-next: build failure after merge of the drm tree

[Stephen Rothwell]

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/gma500/psb_drv.c: At top level:
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: braces around scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: initialization from incompatible pointer type [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: (near initialization for 'driver.fops') [enabled by default]

Caused by commit 5c49fd3aa0ab ("gma500: Add the core DRM files and
headers") interacting with commit e08e96de986c ("drm: Make the per-driver
file_operations struct const").  Again needed fixing up in commit
b63e0f9cb433 ("Merge branch 'drm-gma500-alanc' into drm-core-next").  Or
Alan should do his work based on the drm-next tree (which would then have
to become non rebasing) ...

I have used the version of the drm tree from next-20111115 again.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature