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

Hi Jiri,

After merging the hid tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/hid/Kconfig:698: unexpected 'endif' within menu block
drivers/hid/Kconfig:702: unexpected 'endmenu' within if block
drivers/Kconfig:151: 'endmenu' in different file than 'menu'
drivers/hid/Kconfig:79: location of the 'menu'
arch/powerpc/kvm/Kconfig:153: syntax error
drivers/Kconfig:1: missing end statement for this entry

Caused by bad merge 8494746044bf ("Merge branch 'roccat' into
for-next").  This added a second copy of

menu "Special HID drivers"

I have used the hid tree from next-20120628 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au