summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/Makefile5
-rw-r--r--drivers/video/imx-ipu-fb.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 1e0d1b93a0..179f0c42f6 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -1,3 +1,4 @@
-obj-$(CONFIG_VIDEO) += fb.o
-obj-$(CONFIG_DRIVER_VIDEO_IMX) += imx.o
+obj-$(CONFIG_VIDEO) += fb.o
+
+obj-$(CONFIG_DRIVER_VIDEO_IMX) += imx.o
obj-$(CONFIG_DRIVER_VIDEO_IMX_IPU) += imx-ipu-fb.o
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 4a27009bcc..0bd86b286d 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -398,7 +398,7 @@ static inline u32 reg_read(struct ipu_fb_info *fbi, unsigned long reg)
val = readl(fbi->regs + reg);
- debug("%s: %p 0x%08x\n", __func__, ipu_base + reg, val);
+ debug("%s: %p 0x%08x\n", __func__, fbi->regs + reg, val);
return val;
}
@@ -406,7 +406,7 @@ static inline u32 reg_read(struct ipu_fb_info *fbi, unsigned long reg)
static inline void reg_write(struct ipu_fb_info *fbi, u32 value,
unsigned long reg)
{
- debug("%s: %p 0x%08x\n", __func__, ipu_base + reg, value);
+ debug("%s: %p 0x%08x\n", __func__, fbi->regs + reg, value);
writel(value, fbi->regs + reg);
}