diff --git a/[refs] b/[refs]
index 5bdba184cf14..86aec4d4573a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb982803522bc86ca61774c6edf317f77165453
+refs/heads/master: 5e4968e24ced93b7b130e7e1fc947a79f82776bf
diff --git a/trunk/sound/pci/fm801.c b/trunk/sound/pci/fm801.c
index 88a3e9f3224a..f3f2b2c99723 100644
--- a/trunk/sound/pci/fm801.c
+++ b/trunk/sound/pci/fm801.c
@@ -321,10 +321,8 @@ static unsigned int channels[] = {
   2, 4, 6
 };
 
-#define CHANNELS sizeof(channels) / sizeof(channels[0])
-
 static struct snd_pcm_hw_constraint_list hw_constraints_channels = {
-	.count = CHANNELS,
+	.count = ARRAY_SIZE(channels),
 	.list = channels,
 	.mask = 0,
 };