diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-04 17:20:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-04 17:22:38 +1100 |
| commit | 42dc29ce81a3fe94810eacdabac2634db38b4982 (patch) | |
| tree | 1cfe09a7afbd15af6a9a104bfa671fc24b75d58d /include/linux/hil_mlc.h | |
| parent | 450c2bc68f128ea2890844fdd7f374ddee489f71 (diff) | |
| parent | 890f841dac014ee441cf8471efb9db666d34a6de (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/char/xilinx_hwicap/xilinx_hwicap.c
include/linux/memory.h
Diffstat (limited to 'include/linux/hil_mlc.h')
| -rw-r--r-- | include/linux/hil_mlc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h index 8df29ca48a13..394a8405dd74 100644 --- a/include/linux/hil_mlc.h +++ b/include/linux/hil_mlc.h @@ -34,7 +34,7 @@ #include <linux/hil.h> #include <linux/time.h> #include <linux/interrupt.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> #include <linux/serio.h> #include <linux/list.h> |