From 66c37b547fca414cbe6c5e990cda2edc7534edd0 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Tue, 21 Oct 2008 00:04:04 +0100 Subject: [PATCH] --- yaml --- r: 116758 b: refs/heads/master c: e798ba57e9f423dddbf1bdeb20a62bdd0593890f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 2 +- trunk/mm/tiny-shmem.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 006e3bd7e78a..1987418568d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 653c03168348ac7aebb969931f87ba281749d7dd +refs/heads/master: e798ba57e9f423dddbf1bdeb20a62bdd0593890f diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 9097500de5f4..a8b33c2ec8d2 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -6,7 +6,7 @@ # menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" - depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && SHMEM + depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU help Kernel-level support for the Direct Rendering Infrastructure (DRI) introduced in XFree86 4.0. If you say Y here, you need to select diff --git a/trunk/mm/tiny-shmem.c b/trunk/mm/tiny-shmem.c index 8d7a27a6335c..3e67d575ee6e 100644 --- a/trunk/mm/tiny-shmem.c +++ b/trunk/mm/tiny-shmem.c @@ -95,6 +95,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) put_memory: return ERR_PTR(error); } +EXPORT_SYMBOL_GPL(shmem_file_setup); /** * shmem_zero_setup - setup a shared anonymous mapping