summaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/jornada720_bl.c
diff options
context:
space:
mode:
authorPatrick McHardy2011-04-13 13:32:28 +0200
committerPatrick McHardy2011-04-13 13:32:28 +0200
commitb32e3dc7860d00124fa432dba09667e647cb9bcc (patch)
tree2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/video/backlight/jornada720_bl.c
parentnetfilter: ipset: References are protected by rwlock instead of mutex (diff)
parentnetfilter: xt_conntrack: fix inverted conntrack direction test (diff)
downloadkernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.gz
kernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.xz
kernel-qcow2-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.zip
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/video/backlight/jornada720_bl.c')
-rw-r--r--drivers/video/backlight/jornada720_bl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 2f177b3a4885..de65d80159be 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -106,6 +106,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
struct backlight_device *bd;
memset(&props, 0, sizeof(struct backlight_properties));
+ props.type = BACKLIGHT_RAW;
props.max_brightness = BL_MAX_BRIGHT;
bd = backlight_device_register(S1D_DEVICENAME, &pdev->dev, NULL,
&jornada_bl_ops, &props);
@@ -146,12 +147,12 @@ static struct platform_driver jornada_bl_driver = {
},
};
-int __init jornada_bl_init(void)
+static int __init jornada_bl_init(void)
{
return platform_driver_register(&jornada_bl_driver);
}
-void __exit jornada_bl_exit(void)
+static void __exit jornada_bl_exit(void)
{
platform_driver_unregister(&jornada_bl_driver);
}