diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-12 15:29:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-12 15:29:46 +1100 |
| commit | 7a6a5785a0f8e1f14563fe2ae8690c7ebf440e8e (patch) | |
| tree | a419c24556bb15e268805d72bb30f7bce1220735 /include/asm-ppc/ocp.h | |
| parent | 4dd84d8b64ea9c4ab27ba9717f58b290a6d3c6ee (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/firewire/fw-device.c
Diffstat (limited to 'include/asm-ppc/ocp.h')
| -rw-r--r-- | include/asm-ppc/ocp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 1379a4f76de3..3909a2eec286 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h @@ -31,7 +31,6 @@ #include <asm/mmu.h> #include <asm/ocp_ids.h> -#include <asm/semaphore.h> #ifdef CONFIG_PPC_OCP |