diff options
| author | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
| commit | 2bcb132c693566bcb8208cc7ce66b72a4f852ecf (patch) | |
| tree | 6fc4f05ce18140d86aa78a10380a610734aeaef9 /arch/powerpc/mm/mem.c | |
| parent | USB: serial: io_ti.c: remove dbg() usage (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.tar.gz kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.zip | |
Merge 3.6-rc6 into usb-next
This resolves the merge problems with:
drivers/usb/dwc3/gadget.c
drivers/usb/musb/tusb6010.c
that had been seen in linux-next.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index baaafde7d135..fbdad0e3929a 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -469,6 +469,7 @@ void flush_dcache_icache_page(struct page *page) __flush_dcache_icache_phys(page_to_pfn(page) << PAGE_SHIFT); #endif } +EXPORT_SYMBOL(flush_dcache_icache_page); void clear_user_page(void *page, unsigned long vaddr, struct page *pg) { |