diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2008-04-18 22:21:05 -0400 |
|---|---|---|
| committer | Matthew Wilcox <willy@linux.intel.com> | 2008-04-18 22:22:54 -0400 |
| commit | 6188e10d38b8d7244ee7776d5f1f88c837b4b93f (patch) | |
| tree | 6675e02c47fb684a613e10513816b5dcc5de28a9 /drivers/macintosh | |
| parent | d7b1acd3b524b39f418e463e836b48ac041954d6 (diff) | |
Convert asm/semaphore.h users to linux/semaphore.h
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/adb.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/windfarm_smu_sat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 28958101061f..20978205cd02 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
| @@ -37,9 +37,9 @@ | |||
| 37 | #include <linux/device.h> | 37 | #include <linux/device.h> |
| 38 | #include <linux/kthread.h> | 38 | #include <linux/kthread.h> |
| 39 | #include <linux/platform_device.h> | 39 | #include <linux/platform_device.h> |
| 40 | #include <linux/semaphore.h> | ||
| 40 | 41 | ||
| 41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 42 | #include <asm/semaphore.h> | ||
| 43 | #ifdef CONFIG_PPC | 43 | #ifdef CONFIG_PPC |
| 44 | #include <asm/prom.h> | 44 | #include <asm/prom.h> |
| 45 | #include <asm/machdep.h> | 45 | #include <asm/machdep.h> |
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index f449d775cdf4..797918d0e59c 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
| 15 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
| 16 | #include <asm/semaphore.h> | 16 | #include <linux/semaphore.h> |
| 17 | #include <asm/prom.h> | 17 | #include <asm/prom.h> |
| 18 | #include <asm/smu.h> | 18 | #include <asm/smu.h> |
| 19 | #include <asm/pmac_low_i2c.h> | 19 | #include <asm/pmac_low_i2c.h> |