diff --git a/[refs] b/[refs]
index 9bee115e99f9..c5b9e7f208d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 471a24c0589cd192dcd2c6770ab6252cd42b1cff
+refs/heads/master: 6613f82dd293b23f582a649b287fadbf8d23e6cf
diff --git a/trunk/drivers/atm/suni.c b/trunk/drivers/atm/suni.c
index 06817dec0c25..b1d063cc4fbe 100644
--- a/trunk/drivers/atm/suni.c
+++ b/trunk/drivers/atm/suni.c
@@ -188,7 +188,7 @@ static int suni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
 		case SONET_GETDIAG:
 			return get_diag(dev,arg);
 		case SONET_SETFRAMING:
-			if (arg != SONET_FRAME_SONET) return -EINVAL;
+			if ((int)(unsigned long)arg != SONET_FRAME_SONET) return -EINVAL;
 			return 0;
 		case SONET_GETFRAMING:
 			return put_user(SONET_FRAME_SONET,(int __user *)arg) ?