summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-05 17:38:12 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-11 13:50:10 +0200
commit1d2019fb6be2f318f0aa85be5f224f47a5f006fe (patch)
tree62d85b5c625b7279036a5e125ec2479298b448bc /sound
parentb7d22ccf08d67d13f77a9580d07e7f72e6241213 (diff)
downloadop-kernel-dev-1d2019fb6be2f318f0aa85be5f224f47a5f006fe.zip
op-kernel-dev-1d2019fb6be2f318f0aa85be5f224f47a5f006fe.tar.gz
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c2
1 files changed, 1 insertions, 1 deletions
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>
OpenPOWER on IntegriCloud