pohmelfs needs I_LOCK

[Geert Uytterhoeven]

There's a conflict in 2.6.33-rc1 between the following 2 commits:

commit ff8079d4f1016a12e34ab323737314f24127dd ("kill I_LOCK")
commit e3eec94dc91c39f2bd7939294b9cd4a65a82db44 ("Staging: pohmelfs: directory
operations")

drivers/staging/pohmelfs/dir.c: In function 'pohmelfs_remove_entry':
drivers/staging/pohmelfs/dir.c:725: error: 'I_LOCK' undeclared (first use in this function)
drivers/staging/pohmelfs/dir.c:725: error: (Each undeclared identifier is reported only once
drivers/staging/pohmelfs/dir.c:725: error: for each function it appears in.)

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/