From e182e9f0c8d4032d73c0ae1bf685278ca8f7e2ff Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 18 Feb 2009 19:35:17 -0800 Subject: [PATCH] --- yaml --- r: 134634 b: refs/heads/master c: ca1ada8861f22db37530594615b635d3dd1bde82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/firestream.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 860b333d8c21..4af21c3007d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcf495b415c5b7611768f54ee931ca165289c8e3 +refs/heads/master: ca1ada8861f22db37530594615b635d3dd1bde82 diff --git a/trunk/drivers/atm/firestream.c b/trunk/drivers/atm/firestream.c index 98099f526d82..b119640e1ee9 100644 --- a/trunk/drivers/atm/firestream.c +++ b/trunk/drivers/atm/firestream.c @@ -1690,17 +1690,17 @@ static int __devinit fs_init (struct fs_dev *dev) | (0 * SARMODE0_SHADEN) /* We don't use shadow registers. */ | (1 * SARMODE0_INTMODE_READCLEAR) | (1 * SARMODE0_CWRE) - | IS_FS50(dev)?SARMODE0_PRPWT_FS50_5: - SARMODE0_PRPWT_FS155_3 + | (IS_FS50(dev) ? SARMODE0_PRPWT_FS50_5: + SARMODE0_PRPWT_FS155_3) | (1 * SARMODE0_CALSUP_1) - | IS_FS50 (dev)?(0 + | (IS_FS50(dev) ? (0 | SARMODE0_RXVCS_32 | SARMODE0_ABRVCS_32 | SARMODE0_TXVCS_32): (0 | SARMODE0_RXVCS_1k | SARMODE0_ABRVCS_1k - | SARMODE0_TXVCS_1k)); + | SARMODE0_TXVCS_1k))); /* 10ms * 100 is 1 second. That should be enough, as AN3:9 says it takes 1ms. */