aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2o-dev.h16
-rw-r--r--include/linux/i2o.h5
2 files changed, 8 insertions, 13 deletions
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h
index ef7f644dd87..3414325bdcf 100644
--- a/include/linux/i2o-dev.h
+++ b/include/linux/i2o-dev.h
@@ -24,6 +24,14 @@
#define MAX_I2O_CONTROLLERS 32
//#include <linux/ioctl.h>
+#ifndef __KERNEL__
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+#endif /* __KERNEL__ */
+
/*
* I2O Control IOCTLs and structures
@@ -126,14 +134,6 @@ struct i2o_evt_get {
#define I2O_BUS_CARDBUS 7
#define I2O_BUS_UNKNOWN 0x80
-#ifndef __KERNEL__
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-#endif /* __KERNEL__ */
-
typedef struct _i2o_pci_bus {
u8 PciFunctionNumber;
u8 PciDeviceNumber;
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index ea9a3ad4b67..40e45a83d3f 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -152,11 +152,6 @@ struct i2o_controller {
unsigned int raptor:1; /* split bar */
unsigned int promise:1; /* Promise controller */
-#ifdef CONFIG_MTRR
- int mtrr_reg0;
- int mtrr_reg1;
-#endif
-
struct list_head devices; /* list of I2O devices */
struct notifier_block *event_notifer; /* Events */