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

[broonie]

Hi all,

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

/tmp/next/build/drivers/hid/hid-nintendo.c:406:29: error: redefinition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
  406 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/hid/hid-nintendo.c:295:29: note: previous definition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT' was here
  295 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  7af32d156ad7 ("Revert "HID: nintendo: Fix unused-const-variable compiler warning"")

interacting with

  92cdfba40155 ("HID: nintendo: fix unused const warning")

I'll apply a fixup for now.