diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:28 +0200 |
| commit | 75b5032212641f6d38ac041416945e70da833b68 (patch) | |
| tree | bb827401e00c1681a29e75ade3b4ecc903df1a54 /drivers/dma/ioat_dma.c | |
| parent | 0b73da3f40128eab6ca2a07508f424029a1edaeb (diff) | |
| parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
| download | linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.gz linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.bz2 linux-stable-75b5032212641f6d38ac041416945e70da833b68.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters
release.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/dma/ioat_dma.c')
| -rw-r--r-- | drivers/dma/ioat_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 1955ee8d6d20..a600fc0f7962 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -173,7 +173,7 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device) xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale)); #ifdef CONFIG_I7300_IDLE_IOAT_CHANNEL - if (i7300_idle_platform_probe(NULL, NULL) == 0) { + if (i7300_idle_platform_probe(NULL, NULL, 1) == 0) { device->common.chancnt--; } #endif |