diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 16:27:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 16:27:30 +0100 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/video/xen-fbfront.c | |
| parent | ARM: 7629/1: mm: Fix missing XN flag for for MT_MEMORY_SO (diff) | |
| parent | ARM: virt: simplify __hyp_stub_install epilog (diff) | |
| download | linux-210b1847b32951f52d19df229972399e5b987de2.tar.xz linux-210b1847b32951f52d19df229972399e5b987de2.zip | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/video/xen-fbfront.c')
| -rw-r--r-- | drivers/video/xen-fbfront.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index 917bb5681684..cd005c227a23 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -358,8 +358,8 @@ static irqreturn_t xenfb_event_handler(int rq, void *dev_id) return IRQ_HANDLED; } -static int __devinit xenfb_probe(struct xenbus_device *dev, - const struct xenbus_device_id *id) +static int xenfb_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) { struct xenfb_info *info; struct fb_info *fb_info; @@ -487,8 +487,7 @@ error: return ret; } -static __devinit void -xenfb_make_preferred_console(void) +static void xenfb_make_preferred_console(void) { struct console *c; |