summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/backend.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-16 17:17:04 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-16 17:17:04 +0100
commitf8abea8f8c24ecdad6d6861bffb912f23f2741cd (patch)
tree7d5af9c3d92b3afd0d585aabd6537db36c8095ae /drivers/char/agp/backend.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
parent[AGPGART] allow drm populated agp memory types cleanups (diff)
downloadlinux-f8abea8f8c24ecdad6d6861bffb912f23f2741cd.tar.xz
linux-f8abea8f8c24ecdad6d6861bffb912f23f2741cd.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] allow drm populated agp memory types cleanups [AGPGART] intel-agp: Use ARRAY_SIZE macro when appropriate [AGPGART] Add agp-type-to-mask-type method missing from some drivers. [AGPGART] Don't try to remap i810 registers on resume. [AGPGART] Allow drm-populated agp memory types [AGPGART] compat ioctl
Diffstat (limited to 'drivers/char/agp/backend.c')
-rw-r--r--drivers/char/agp/backend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index d59e037ddd12..ebdd6dd66edb 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -43,7 +43,7 @@
* fix some real stupidity. It's only by chance we can bump
* past 0.99 at all due to some boolean logic error. */
#define AGPGART_VERSION_MAJOR 0
-#define AGPGART_VERSION_MINOR 101
+#define AGPGART_VERSION_MINOR 102
static const struct agp_version agp_current_version =
{
.major = AGPGART_VERSION_MAJOR,