diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/linux/root_dev.h | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/root_dev.h')
| -rw-r--r-- | include/linux/root_dev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/root_dev.h b/include/linux/root_dev.h index ea4bc9d13735..ed241aad7c17 100644 --- a/include/linux/root_dev.h +++ b/include/linux/root_dev.h | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | #define _ROOT_DEV_H_ | 2 | #define _ROOT_DEV_H_ |
| 3 | 3 | ||
| 4 | #include <linux/major.h> | 4 | #include <linux/major.h> |
| 5 | #include <linux/types.h> | ||
| 6 | #include <linux/kdev_t.h> | ||
| 5 | 7 | ||
| 6 | enum { | 8 | enum { |
| 7 | Root_NFS = MKDEV(UNNAMED_MAJOR, 255), | 9 | Root_NFS = MKDEV(UNNAMED_MAJOR, 255), |