diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /arch/arm/mach-davinci/dm646x.c | |
| parent | ALSA: oxygen - Add a SSID for CMI8787-HG2PCI (diff) | |
| parent | OSS: soundcard: locking bug in sound_ioctl() (diff) | |
| download | linux-dev-4e83998f5af010a928495988c586ea2926624db9.tar.xz linux-dev-4e83998f5af010a928495988c586ea2926624db9.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/mach-davinci/dm646x.c')
| -rw-r--r-- | arch/arm/mach-davinci/dm646x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index e4a3df1872ac..26e8a9c7f50b 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -737,8 +737,7 @@ static struct map_desc dm646x_io_desc[] = { .virtual = SRAM_VIRT, .pfn = __phys_to_pfn(0x00010000), .length = SZ_32K, - /* MT_MEMORY_NONCACHED requires supersection alignment */ - .type = MT_DEVICE, + .type = MT_MEMORY_NONCACHED, }, }; |