4 files changed, 27 insertions, 17 deletions
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index d885570b24..ae6ff74cab 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -125,6 +125,7 @@ int register_framebuffer(struct fb_info *info)
 
 	sprintf(dev->name, "fb");
 
+	info->dev.bus = &fb_bus;
 	register_device(&info->dev);
 	dev_add_param(dev, "enable", fb_enable_set, NULL, 0);
 	dev_set_param(dev, "enable", "0");
@@ -160,19 +161,41 @@ static void fb_info(struct device_d *dev)
 	printf("\n");
 }
 
-static int fb_probe(struct device_d *hw_dev)
+static struct driver_d fb_driver = {
+	.name  = "fb",
+	.info = fb_info,
+};
+
+static int fb_match(struct device_d *dev, struct driver_d *drv)
 {
 	return 0;
 }
 
-static struct driver_d fb_driver = {
-	.name  = "fb",
+static int fb_probe(struct device_d *dev)
+{
+	return 0;
+}
+
+static void fb_remove(struct device_d *dev)
+{
+}
+
+struct bus_type fb_bus = {
+	.name = "fb",
+	.match = fb_match,
 	.probe = fb_probe,
-	.info = fb_info,
+	.remove = fb_remove,
 };
 
+static int fb_bus_init(void)
+{
+	return bus_register(&fb_bus);
+}
+pure_initcall(fb_bus_init);
+
 static int fb_init_driver(void)
 {
+	fb_driver.bus = &fb_bus;
 	register_driver(&fb_driver);
 	return 0;
 }
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 8039de0f9a..80236b3f23 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -15,10 +15,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <common.h>
diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c
index 900ae80165..f06a3945fa 100644
--- a/drivers/video/pxa.c
+++ b/drivers/video/pxa.c
@@ -11,11 +11,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- *
  * Derived from the linux-2.6 pxa framebuffer driver:
  *
  * Copyright (C) 1999 Eric A. Thomas.
diff --git a/drivers/video/s3c24xx.c b/drivers/video/s3c24xx.c
index 5d5d8f6d8d..4925ca8461 100644
--- a/drivers/video/s3c24xx.c
+++ b/drivers/video/s3c24xx.c
@@ -16,10 +16,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  *
  */