Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 13 insertions, 18 deletions

diff --git a/include/video/metronomefb.h b/include/video/metronomefb.h
index dab04b4fad7f..9863f4b6d418 100644
--- a/include/video/metronomefb.h
+++ b/include/video/metronomefb.h
@@ -12,14 +12,6 @@
 #ifndef _LINUX_METRONOMEFB_H_
 #define _LINUX_METRONOMEFB_H_
 
-/* address and control descriptors used by metronome controller */
-struct metromem_desc {
-        u32 mFDADR0;
-        u32 mFSADR0;
-        u32 mFIDR0;
-        u32 mLDCMD0;
-};
-
 /* command structure used by metronome controller */
 struct metromem_cmd {
         u16 opcode;
@@ -29,34 +21,37 @@ struct metromem_cmd {
 
 /* struct used by metronome. board specific stuff comes from *board */
 struct metronomefb_par {
-        unsigned char *metromem;
-        struct metromem_desc *metromem_desc;
         struct metromem_cmd *metromem_cmd;
         unsigned char *metromem_wfm;
         unsigned char *metromem_img;
         u16 *metromem_img_csum;
         u16 *csum_table;
-        int metromemsize;
         dma_addr_t metromem_dma;
-        dma_addr_t metromem_desc_dma;
         struct fb_info *info;
         struct metronome_board *board;
         wait_queue_head_t waitq;
         u8 frame_count;
+        int extra_size;
+        int dt;
 };
 
-/* board specific routines */
+/* board specific routines and data */
 struct metronome_board {
-        struct module *owner;
-        void (*free_irq)(struct fb_info *);
-        void (*init_gpio_regs)(struct metronomefb_par *);
-        void (*init_lcdc_regs)(struct metronomefb_par *);
-        void (*post_dma_setup)(struct metronomefb_par *);
+        struct module *owner; /* the platform device */
         void (*set_rst)(struct metronomefb_par *, int);
         void (*set_stdby)(struct metronomefb_par *, int);
+        void (*cleanup)(struct metronomefb_par *);
         int (*met_wait_event)(struct metronomefb_par *);
         int (*met_wait_event_intr)(struct metronomefb_par *);
         int (*setup_irq)(struct fb_info *);
+        int (*setup_fb)(struct metronomefb_par *);
+        int (*setup_io)(struct metronomefb_par *);
+        int (*get_panel_type)(void);
+        unsigned char *metromem;
+        int fw;
+        int fh;
+        int wfm_size;
+        struct fb_info *host_fbinfo; /* the host LCD controller's fbi */
 };
 
 #endif