hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/policy/10osvendor/Makefile.am |    4 ++++
 hald/linux/addons/.gitignore      |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit f9d80dda453af3d8761b32e37905ddf56ebdcd97
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 13 21:16:17 2008 +0100

    add 10-imac-backlight.fdi to Makefile
    
    Added 10-imac-backlight.fdi to Makefile.

diff --git a/fdi/policy/10osvendor/Makefile.am b/fdi/policy/10osvendor/Makefile.am
index 19f1825..a30aac0 100644
--- a/fdi/policy/10osvendor/Makefile.am
+++ b/fdi/policy/10osvendor/Makefile.am
@@ -25,6 +25,10 @@ if BUILD_MACBOOK
 dist_fdi_DATA += 10-macbook-backlight.fdi
 endif
 
+if BUILD_IMAC
+dist_fdi_DATA += 10-imac-backlight.fdi
+endif
+
 if BUILD_CPUFREQ
 dist_fdi_DATA += 10-cpufreq.fdi
 endif
commit 8d49e3f6ea956a749470ed6a17bdc82e284726d4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 13 20:40:13 2008 +0100

    update .gitignore for hald-addon-imac-backlight
    
    Updated .gitignore for hald-addon-imac-backlight.

diff --git a/hald/linux/addons/.gitignore b/hald/linux/addons/.gitignore
index 6bbce11..9e9d379 100644
--- a/hald/linux/addons/.gitignore
+++ b/hald/linux/addons/.gitignore
@@ -15,5 +15,6 @@ hald-addon-macbook-backlight
 hald-addon-macbookpro-backlight
 hald-addon-cpufreq
 hald-addon-dell-backlight
+hald-addon-imac-backlight
 *.o
 *~