git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
genhd.h
diff --git
a/include/linux/genhd.h
b/include/linux/genhd.h
index
2ef845b
..
e4af57e
100644
(file)
--- a/
include/linux/genhd.h
+++ b/
include/linux/genhd.h
@@
-9,13
+9,7
@@
* <drew@colorado.edu>
*/
* <drew@colorado.edu>
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/types.h>
-#include <linux/major.h>
-#include <linux/device.h>
-#include <linux/smp.h>
-#include <linux/string.h>
-#include <linux/fs.h>
enum {
/* These three have identical behaviour; use the second one if DOS FDISK gets
enum {
/* These three have identical behaviour; use the second one if DOS FDISK gets
@@
-61,6
+55,12
@@
struct partition {
#endif
#ifdef __KERNEL__
#endif
#ifdef __KERNEL__
+#include <linux/major.h>
+#include <linux/device.h>
+#include <linux/smp.h>
+#include <linux/string.h>
+#include <linux/fs.h>
+
struct partition {
unsigned char boot_ind; /* 0x80 - active */
unsigned char head; /* starting head */
struct partition {
unsigned char boot_ind; /* 0x80 - active */
unsigned char head; /* starting head */
@@
-112,8
+112,6
@@
struct gendisk {
sector_t capacity;
int flags;
sector_t capacity;
int flags;
- char devfs_name[64]; /* devfs crap */
- int number; /* more of the same */
struct device *driverfs_dev;
struct kobject kobj;
struct kobject *holder_dir;
struct device *driverfs_dev;
struct kobject kobj;
struct kobject *holder_dir;