Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 23:01:39 +0000 (16:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 23:01:39 +0000 (16:01 -0700)
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3477/1: ARM EABI: undefine removed syscalls
  [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table
  [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN

arch/arm/mach-s3c2410/common-smdk.c
arch/arm/mach-s3c2410/s3c2440-clock.c
include/asm-arm/unistd.h

index f372fbda124e14e68663ac5207374b04ae381a63..c940890f621f1902fe761773acd2aa9b999b8188 100644 (file)
@@ -50,7 +50,7 @@ static struct mtd_partition smdk_default_nand_part[] = {
                .offset = 0,
        },
        [1] = {
-               .name   = "S3C2410 flash parition 1",
+               .name   = "S3C2410 flash partition 1",
                .offset = 0,
                .size   = SZ_2M,
        },
index 57a15974d4b50aaded6667882e4004b459cca878..d7a30ed6c327eb57d2f3c4ff454939a70f6129fd 100644 (file)
@@ -139,7 +139,7 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
 
                clkdivn = __raw_readl(S3C2410_CLKDIVN);
                clkdivn |= S3C2440_CLKDIVN_UCLK;
-               __raw_writel(camdivn, S3C2410_CLKDIVN);
+               __raw_writel(clkdivn, S3C2410_CLKDIVN);
 
                mutex_unlock(&clocks_mutex);
        }
index 65ac305c2d457fae139048b71093bc34972e8b4c..ee8dfea549bc324239b1e60f0cdd9ef984e75dfb 100644 (file)
 #define __ARM_NR_usr32                 (__ARM_NR_BASE+4)
 #define __ARM_NR_set_tls               (__ARM_NR_BASE+5)
 
+/*
+ * The following syscalls are obsolete and no longer available for EABI.
+ */
+#if defined(__ARM_EABI__)
+#undef __NR_time
+#undef __NR_umount
+#undef __NR_stime
+#undef __NR_alarm
+#undef __NR_utime
+#undef __NR_getrlimit
+#undef __NR_select
+#undef __NR_readdir
+#undef __NR_mmap
+#undef __NR_socketcall
+#undef __NR_syscall
+#undef __NR_ipc
+#endif
+
 #define __sys2(x) #x
 #define __sys1(x) __sys2(x)