Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / char / drm / drm_hashtab.h

diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
index 40afec05bff80fd37ec9e90332275cbcbfc263d6..613091c970af932775630b06a593ef4bfd6cab45 100644 (file)
--- a/drivers/char/drm/drm_hashtab.h
+++ b/drivers/char/drm/drm_hashtab.h
@@ -47,6 +47,7 @@ typedef struct drm_open_hash{
        unsigned int order;
        unsigned int fill;
        struct hlist_head *table;
+       int use_vmalloc;
 } drm_open_hash_t;