Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index ee855c5202e8..d427f322e207 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -211,8 +211,8 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev)
 
         if (!pdata->debounce_time || pdata->debounce_time > MAX_MULT ||
             !pdata->coldrive_time || pdata->coldrive_time > MAX_MULT) {
-                printk(KERN_ERR DRV_NAME
-                        ": Invalid Debounce/Columdrive Time from pdata\n");
+                printk(KERN_WARNING DRV_NAME
+                        ": Invalid Debounce/Columndrive Time in platform data\n");
                 bfin_write_KPAD_MSEL(0xFF0);    /* Default MSEL */
         } else {
                 bfin_write_KPAD_MSEL(
@@ -252,7 +252,7 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev)
         }
 
         error = request_irq(bf54x_kpad->irq, bfin_kpad_isr,
-                                 IRQF_SAMPLE_RANDOM, DRV_NAME, pdev);
+                                0, DRV_NAME, pdev);
         if (error) {
                 printk(KERN_ERR DRV_NAME
                         ": unable to claim irq %d; error %d\n",