summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2003-01-05 22:23:32 -0600
committerPatrick Mochel <mochel@osdl.org>2003-01-05 22:23:32 -0600
commit199578c4252ac04f55cc4463a0eefe0c9c1a1ff3 (patch)
tree7697d798ac5207d807ed200b0f09c723e4b65314 /include/linux/kernel.h
parentefd526efbaad0b5a6789f6c40e75c6a3bf28eae9 (diff)
parent5103c926d715ca7df1ed9fb40214f6ee995b64b6 (diff)
Merge bk://linux.bkbits.net/linux-2.5
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 9cb6277f5b86..e6b95f3bb173 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -105,7 +105,7 @@ extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in
extern int tainted;
extern const char *print_tainted(void);
-#define TAINT_PROPRIETORY_MODULE (1<<0)
+#define TAINT_PROPRIETARY_MODULE (1<<0)
#define TAINT_FORCED_MODULE (1<<1)
#define TAINT_UNSAFE_SMP (1<<2)
#define TAINT_FORCED_RMMOD (1<<3)