From dc6ac8edaf29abb524c20696b0a8b343dcea1ed1 Mon Sep 17 00:00:00 2001
From: Johannes Winkelmann <jw@tks6.net>
Date: Fri, 26 Aug 2005 22:35:39 +0000
Subject: [PATCH] recent linux kernels don't define certain major numbers; add
 them if not defined

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@198 7f574dfc-610e-0410-a909-a81674777703
---
 src/linux.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/linux.c b/src/linux.c
index 3adcf765..d7526199 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -29,8 +29,6 @@
 #include <net/if.h>
 #include <math.h>
 
-#include <linux/major.h>
-
 static struct sysinfo s_info;
 
 static int show_nice_processes;
@@ -1088,6 +1086,28 @@ void update_top()
 	process_find_top(info.cpu, info.memu);
 }
 
+
+/*
+ *  This file is part of gkrellm
+ *  Copyright (C) 1999-2005 Bill Wilson
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+#include <linux/major.h>
+
+#if ! defined (MD_MAJOR)
+#define MD_MAJOR	9
+#endif
+
+#if !defined(LVM_BLK_MAJOR)
+#define LVM_BLK_MAJOR 58
+#endif
+
+#if !defined(NBD_MAJOR)
+#define NBD_MAJOR 43
+#endif
+
 void update_diskio()
 {
 	static unsigned int last = UINT_MAX;