| Message ID | 1303343572-19972-3-git-send-email-jkridner@beagleboard.org |
|---|---|
| State | Accepted |
| Commit | f14a522a6cb6b843d31fd099b5af6a57142f2364 |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
On 21.04.2011 01:52, Jason Kridner wrote: > Without this patch, you should get a warning. > > Signed-off-by: Jason Kridner<jkridner@beagleboard.org> > --- > board/ti/beagle/beagle.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c > index 52a7f93..c0cab9e 100644 > --- a/board/ti/beagle/beagle.c > +++ b/board/ti/beagle/beagle.c > @@ -171,7 +171,7 @@ int misc_init_r(void) > { > struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; > struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; > - struct control_prog_io *prog_io_base = (struct gpio *)OMAP34XX_CTRL_BASE; > + struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE; > > /* Enable i2c2 pullup resisters */ > writel(~(PRG_I2C2_PULLUPRESX),&prog_io_base->io1); Acked-by: Dirk Behme <dirk.behme@de.bosch.com> This should be applied to fix the mainline compiler warning beagle.c: In function 'misc_init_r': beagle.c:174: warning: initialization from incompatible pointer type introduced by commit d4e53f063dd25e071444b87303573e7440deeb89 ("OMAP3: BeagleBoard: Enable pullups on i2c2."). Thanks Dirk
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 52a7f93..c0cab9e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -171,7 +171,7 @@ int misc_init_r(void) { struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - struct control_prog_io *prog_io_base = (struct gpio *)OMAP34XX_CTRL_BASE; + struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE; /* Enable i2c2 pullup resisters */ writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1);
Without this patch, you should get a warning. Signed-off-by: Jason Kridner <jkridner@beagleboard.org> --- board/ti/beagle/beagle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)