diff options
author | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/arm/nwfpe/fpa11.c | |
parent | [PATCH] Removed remaining PCI specific references from swiotlb.c (diff) | |
parent | [PATCH] Fix handling spurious page fault for hugetlb region (diff) | |
download | linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.xz linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/arm/nwfpe/fpa11.c')
-rw-r--r-- | arch/arm/nwfpe/fpa11.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c index 7690f731ee87..7b3d74d73c80 100644 --- a/arch/arm/nwfpe/fpa11.c +++ b/arch/arm/nwfpe/fpa11.c @@ -31,11 +31,6 @@ #include <linux/string.h> #include <asm/system.h> -/* forward declarations */ -unsigned int EmulateCPDO(const unsigned int); -unsigned int EmulateCPDT(const unsigned int); -unsigned int EmulateCPRT(const unsigned int); - /* Reset the FPA11 chip. Called to initialize and reset the emulator. */ static void resetFPA11(void) { |