commit 1d2019fb6be2f318f0aa85be5f224f47a5f006fe
author Nicolas Kaiser <nikai@nikai.net> Tue Oct 05 17:38:12 2010 +0200
committer Takashi Iwai <tiwai@suse.de> Mon Oct 11 13:50:10 2010 +0200
tree 62d85b5c625b7279036a5e125ec2479298b448bc
parent b7d22ccf08d67d13f77a9580d07e7f72e6241213

ALSA: sound/usb/usx2y: simplify conditional

Simplify conditional: (a || (!a && b)) => (a || b)

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/usb/usx2y/usx2yhwdeppcm.c

diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 2a528e5..3146a81 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -54,7 +54,7 @@
 #include <linux/gfp.h>
 #include "usbusx2yaudio.c"
 
-#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) &&  USX2Y_NRPACKS == 1)
+#if defined(USX2Y_NRPACKS_VARIABLE) || USX2Y_NRPACKS == 1
 
 #include <sound/hwdep.h>