diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
| commit | 7f03292ee16e68be96aa88904afc6152f8d37736 (patch) | |
| tree | 5c32738f0348449c2fa9688d52e6ecf4445d76f0 /drivers/clocksource/cs5535-clockevt.c | |
| parent | c5ecc484c528ff50bdbb16fbfbac758ee368b329 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
Merge branch 'master' into for-2.6.34
Conflicts:
include/linux/blkdev.h
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/clocksource/cs5535-clockevt.c')
| -rw-r--r-- | drivers/clocksource/cs5535-clockevt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c index 27d20fac19d1..b314a999aabe 100644 --- a/drivers/clocksource/cs5535-clockevt.c +++ b/drivers/clocksource/cs5535-clockevt.c @@ -21,7 +21,7 @@ #define DRV_NAME "cs5535-clockevt" -static int timer_irq = CONFIG_CS5535_MFGPT_DEFAULT_IRQ; +static int timer_irq; module_param_named(irq, timer_irq, int, 0644); MODULE_PARM_DESC(irq, "Which IRQ to use for the clock source MFGPT ticks."); |