[ARM] Miscellaneous fixes

- Remove 'arc' machine name from Makefile
- clk_set_rate() should return non-zero atm.
- proc-sa1100.S doesn't need asm/ptrace.h
- update mach-types
- kill line of spaces in clock.h

arch/arm/Makefile

@@ -64,7 +64,6 @@ DATAADDR	:= .
 head-y		:= arch/arm/kernel/head.o arch/arm/kernel/init_task.o
 textaddr-y	:= 0xC0008000
 
- machine-$(CONFIG_ARCH_ARCA5K)	   := arc
  machine-$(CONFIG_ARCH_RPC)	   := rpc
  machine-$(CONFIG_ARCH_EBSA110)	   := ebsa110
  machine-$(CONFIG_ARCH_CLPS7500)   := clps7500

arch/arm/mach-versatile/clock.c

@@ -97,7 +97,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
 		ret = 0;
 	}
 #endif
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(clk_set_rate);
 

arch/arm/mm/proc-sa1100.S

@@ -24,7 +24,6 @@
 #include <asm/procinfo.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
-#include <asm/ptrace.h>
 
 /*
  * the cache line size of the I and D cache

arch/arm/tools/mach-types

@@ -6,7 +6,7 @@
 # To add an entry into this database, please see Documentation/arm/README,
 # or contact rmk@arm.linux.org.uk
 #
-# Last update: Fri May 28 13:17:46 2004
+# Last update: Mon Jun 28 20:58:04 2004
 #
 # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
 #
@@ -250,8 +250,8 @@ pxa_eagle250		ARCH_PXA_EAGLE250	PXA_EAGLE250		238
 pdb			ARCH_PDB		PDB			239
 blue_2g			SA1100_BLUE_2G		BLUE_2G			240
 bluearch		SA1100_BLUEARCH		BLUEARCH		241
-ixdp2400		ARCH_IXMB2400		IXMB2400		242
-ixdp2800		ARCH_IXMB2800		IXMB2800		243
+ixdp2400		ARCH_IXDB2400		IXDB2400		242
+ixdp2800		ARCH_IXDB2800		IXDB2800		243
 explorer		SA1100_EXPLORER		EXPLORER		244
 ixdp425			ARCH_IXDP425		IXDP425			245
 chimp			ARCH_CHIMP		CHIMP			246
@@ -546,3 +546,14 @@ ddi_blueridge		MACH_DDI_BLUERIDGE	DDI_BLUERIDGE		535
 skyminder		MACH_SKYMINDER		SKYMINDER		536
 lpd79520		MACH_LPD79520		LPD79520		537
 edb9302			MACH_EDB9302		EDB9302			538
+hw90340			MACH_HW90340		HW90340			539
+cip_box			MACH_CIP_BOX		CIP_BOX			540
+ivpn			MACH_IVPN		IVPN			541
+rsoc2			MACH_RSOC2		RSOC2			542
+husky			MACH_HUSKY		HUSKY			543
+boxer			MACH_BOXER		BOXER			544
+shepherd		MACH_SHEPHERD		SHEPHERD		545
+aml42800aa		MACH_AML42800AA		AML42800AA		546
+ml674001		MACH_MACH_TYPE_ML674001	MACH_TYPE_ML674001	547
+lpc2294			MACH_LPC2294		LPC2294			548
+switchgrass		MACH_SWITCHGRASS	SWITCHGRASS		549

include/asm-arm/hardware/clock.h

@@ -108,7 +108,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate);
  * Returns success (0) or negative errno.
  */
 int clk_set_parent(struct clk *clk, struct clk *parent);
-                                                                                
+
 /**
  * clk_get_parent - get the parent clock source for this clock
  * @clk: clock source