diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:20:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:20:11 -0700 |
commit | 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 (patch) | |
tree | 93323b1f7146aefb1843cb995def6c09613bb363 /arch/s390/appldata | |
parent | 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e (diff) | |
parent | 75e9de18f079a51fa987ef0703112d5bc125fdb7 (diff) | |
download | linux-0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4.tar.gz |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] stacktrace bug. [S390] cio: remove casts from/to (void *). [S390] cio: Remove grace period for vary off chpid. [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private [S390] monwriter kzalloc size. [S390] cio: add missing KERN_INFO printk header. [S390] irq change improvements.
Diffstat (limited to 'arch/s390/appldata')
-rw-r--r-- | arch/s390/appldata/appldata_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 2b1e6c9a6e0e..45c9fa7d7545 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c @@ -109,7 +109,7 @@ static LIST_HEAD(appldata_ops_list); * * schedule work and reschedule timer */ -static void appldata_timer_function(unsigned long data, struct pt_regs *regs) +static void appldata_timer_function(unsigned long data) { P_DEBUG(" -= Timer =-\n"); P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(), |