Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
index 4f3c4479c16..1cec02f6c43 100644
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
@@ -144,6 +144,7 @@ void pmu_backlight_set_sleep(int sleep)
 
 void __init pmu_backlight_init()
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
         char name[10];
         int level, autosave;
@@ -161,13 +162,15 @@ void __init pmu_backlight_init()
 
         snprintf(name, sizeof(name), "pmubl");
 
-        bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data,
+                                       &props);
         if (IS_ERR(bd)) {
                 printk(KERN_ERR "PMU Backlight registration failed\n");
                 return;
         }
         uses_pmu_bl = 1;
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
 
         level = bd->props.max_brightness;