summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-06-08 09:18:32 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-08 09:18:32 -0700
commite2d4dc5af36673e64e29973c974246eafe63548f (patch)
treec2b8a080c3e7fda300e8ddfaba94855be7decb9f /block/blk-merge.c
parent53aebb5312c797e4b63fb50473a55ed054b3cb2f (diff)
Staging: cx23885: fix include of altera.h
The cx23885 driver was including staging/altera.h, but that file has moved back into the driver directory. Why a non-staging driver was including a staging driver is beyond me, but this fixes the build so everything is happy for now. For the record, it's not ok for a non-staging driver to depend on a staging one, as that implies that the non-staging one should also be in the staging tree if that's needed. Cc: Igor M. Liplianin <liplianin@netup.ru> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions