diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /include/asm-blackfin/topology.h | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'include/asm-blackfin/topology.h')
| -rw-r--r-- | include/asm-blackfin/topology.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/topology.h b/include/asm-blackfin/topology.h deleted file mode 100644 index acee23987897..000000000000 --- a/include/asm-blackfin/topology.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef _ASM_BLACKFIN_TOPOLOGY_H | ||
| 2 | #define _ASM_BLACKFIN_TOPOLOGY_H | ||
| 3 | |||
| 4 | #include <asm-generic/topology.h> | ||
| 5 | |||
| 6 | #endif /* _ASM_BLACKFIN_TOPOLOGY_H */ | ||