diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/idle | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/idle')
| -rw-r--r-- | drivers/idle/i7300_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index fb176f6ef9f8..17e8ddd01334 100644 --- a/drivers/idle/i7300_idle.c +++ b/drivers/idle/i7300_idle.c | |||
| @@ -177,7 +177,7 @@ static int __init i7300_idle_ioat_selftest(u8 *ctl, | |||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | static struct device dummy_dma_dev = { | 179 | static struct device dummy_dma_dev = { |
| 180 | .bus_id = "fallback device", | 180 | .init_name = "fallback device", |
| 181 | .coherent_dma_mask = DMA_64BIT_MASK, | 181 | .coherent_dma_mask = DMA_64BIT_MASK, |
| 182 | .dma_mask = &dummy_dma_dev.coherent_dma_mask, | 182 | .dma_mask = &dummy_dma_dev.coherent_dma_mask, |
| 183 | }; | 183 | }; |