Merge with Linux 2.4.0-test5-pre6.

4 files changed, 4 insertions, 10 deletions

diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index 47cd4856c..d98013db9 100644
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -27,7 +27,7 @@
 
 struct e820map {
     int nr_map;
-    struct {
+    struct e820entry {
 	long long addr;		/* start of memory segment */
 	long long size;		/* size of memory segment */
 	long type;		/* type of memory segment */
diff --git a/include/asm-sh/sh_bios.h b/include/asm-sh/sh_bios.h
index 7f084b00c..cdb73bdea 100644
--- a/include/asm-sh/sh_bios.h
+++ b/include/asm-sh/sh_bios.h
@@ -7,8 +7,6 @@
  * usually from within the early stages of kernel boot.
  */
 
-#include <config/sh/standard/bios.h>
-
 
 extern void sh_bios_console_write(const char *buf, unsigned int len);
 extern void sh_bios_char_out(char ch);
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 896dadef5..fa8f9cded 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -280,10 +280,10 @@ struct fb_ops {
     /* set colormap */
     int (*fb_set_cmap)(struct fb_cmap *cmap, int kspc, int con,
 		       struct fb_info *info);
-    /* pan display */
+    /* pan display (optional) */
     int (*fb_pan_display)(struct fb_var_screeninfo *var, int con,
 			  struct fb_info *info);
-    /* perform fb specific ioctl */
+    /* perform fb specific ioctl (optional) */
     int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd,
 		    unsigned long arg, int con, struct fb_info *info);
     /* perform fb specific mmap */
@@ -384,9 +384,6 @@ extern int fbgen_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
 extern int fbgen_pan_display(struct fb_var_screeninfo *var, int con,
 			     struct fb_info *info);
-extern int fbgen_ioctl(struct inode *inode, struct file *file,
-		       unsigned int cmd, unsigned long arg, int con,
-		       struct fb_info *info);
 
     /*
      *  Helper functions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 62066f8b0..4043c0353 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -29,6 +29,7 @@
 #define I2C_H
 
 #include <linux/i2c-id.h>	/* id values of adapters et. al. 	*/
+#include <linux/types.h>
 
 
 struct i2c_msg;
@@ -49,7 +50,6 @@ struct i2c_msg;
 #else
 #include <asm/semaphore.h>
 #endif
-#include <linux/types.h>
 #include <linux/config.h>
 
 /* --- General options ------------------------------------------------	*/
@@ -371,7 +371,6 @@ extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
 
 #endif /* __KERNEL__ */
 
-#include <linux/types.h>
 /*
  * I2C Message - used for pure i2c transaction, also from /dev interface
  */