Merge git://git.denx.de/u-boot-x86

include/ns16550.h

@@ -51,10 +51,6 @@
  * @base:		Base register address
  * @reg_shift:		Shift size of registers (0=byte, 1=16bit, 2=32bit...)
  * @clock:		UART base clock speed in Hz
- *
- * @buf:		Pointer to the RX interrupt buffer
- * @rd_ptr:		Read pointer in the RX interrupt buffer
- * @wr_ptr:		Write pointer in the RX interrupt buffer
  */
 struct ns16550_platdata {
 	unsigned long base;
@@ -62,12 +58,6 @@ struct ns16550_platdata {
 	int clock;
 	int reg_offset;
 	u32 fcr;
-
-	int irq;
-
-	char *buf;
-	int rd_ptr;
-	int wr_ptr;
 };
 
 struct udevice;

include/serial.h

@@ -148,10 +148,18 @@ struct dm_serial_ops {
 /**
  * struct serial_dev_priv - information about a device used by the uclass
  *
- * @sdev: stdio device attached to this uart
+ * @sdev:	stdio device attached to this uart
+ *
+ * @buf:	Pointer to the RX buffer
+ * @rd_ptr:	Read pointer in the RX buffer
+ * @wr_ptr:	Write pointer in the RX buffer
  */
 struct serial_dev_priv {
 	struct stdio_dev *sdev;
+
+	char *buf;
+	int rd_ptr;
+	int wr_ptr;
 };
 
 /* Access the serial operations for a device */

include/vbe.h

@@ -104,8 +104,6 @@ struct vbe_ddc_info {
 
 extern struct vbe_mode_info mode_info;
 
-struct graphic_device;
-int vbe_get_video_info(struct graphic_device *gdev);
 struct video_priv;
 struct video_uc_platdata;
 int vbe_setup_video_priv(struct vesa_mode_info *vesa,