Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-2.6] / drivers / hid / hid-input-quirks.c

diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index 845d31d08fa584c8d80878478de94ee03204fecb..4c2052c658f1465f6a8d89494b03a8783a7ba6e3 100644 (file)
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -353,7 +353,7 @@ static const struct hid_input_blacklist {
 
        { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },
 
-       { 0, 0, 0 }
+       { 0, 0, NULL }
 };
 
 int hidinput_mapping_quirks(struct hid_usage *usage,