summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
authorGreg KH2005-06-28 07:07:56 +0200
committerGreg Kroah-Hartman2005-06-28 07:07:56 +0200
commit8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch)
treec43b6c2fdf1b68b66906a2de69446dcec0f9af6b /arch/ppc/kernel
parent[PATCH] PCI: use the MCFG table to properly access pci devices (x86-64) (diff)
parent[PATCH] cfq build fix (diff)
downloadkernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.tar.gz
kernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.tar.xz
kernel-qcow2-linux-8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb.zip
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/misc.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index b6a63a49a232..191a8def3bdb 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -1449,3 +1449,5 @@ _GLOBAL(sys_call_table)
.long sys_request_key /* 270 */
.long sys_keyctl
.long sys_waitid
+ .long sys_ioprio_set
+ .long sys_ioprio_get