diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/macintosh/adbhid.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/macintosh/adbhid.c')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index c69d23bb255e..efd51e01c06e 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -45,8 +45,8 @@ | |||
| 45 | #include <linux/pmu.h> | 45 | #include <linux/pmu.h> |
| 46 | 46 | ||
| 47 | #include <asm/machdep.h> | 47 | #include <asm/machdep.h> |
| 48 | #include <asm/backlight.h> | ||
| 49 | #ifdef CONFIG_PPC_PMAC | 48 | #ifdef CONFIG_PPC_PMAC |
| 49 | #include <asm/backlight.h> | ||
| 50 | #include <asm/pmac_feature.h> | 50 | #include <asm/pmac_feature.h> |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||