mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
change prefix for kernelpatchbase 2.6.26
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13619 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
56
target/linux/s3c24xx/patches-2.6.26/1131-clean-sdio-hcd-suspend.patch.patch
Executable file
56
target/linux/s3c24xx/patches-2.6.26/1131-clean-sdio-hcd-suspend.patch.patch
Executable file
@@ -0,0 +1,56 @@
|
||||
From 83d4d74caed0073bfc16a61e8ad604f64801e6ba Mon Sep 17 00:00:00 2001
|
||||
From: Andy Green <agreen@localhost.localdomain>
|
||||
Date: Fri, 25 Jul 2008 23:06:07 +0100
|
||||
Subject: [PATCH] clean-sdio-hcd-suspend.patch
|
||||
|
||||
fix trailing whitespace and function args for suspend.
|
||||
|
||||
Signed-off-by: Andy Green <andy@openmoko.com>
|
||||
---
|
||||
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 12 ++++++------
|
||||
1 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
|
||||
index fdc69a0..edb8523 100644
|
||||
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
|
||||
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
|
||||
@@ -1365,11 +1365,11 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_PM
|
||||
+#ifdef CONFIG_PM
|
||||
|
||||
-static int s3c24xx_hcd_suspend(struct platform_device * pdev)
|
||||
+static int s3c24xx_hcd_suspend(struct platform_device * pdev, pm_message_t state)
|
||||
{
|
||||
- struct s3c24xx_hcd_context * context = &hcd_context;
|
||||
+ struct s3c24xx_hcd_context * context = &hcd_context;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&context->lock, flags);
|
||||
@@ -1390,18 +1390,18 @@ static int s3c24xx_hcd_suspend(struct platform_device * pdev)
|
||||
context->suspend_regs.datsta = readl(context->base + S3C2410_SDIDSTA);
|
||||
context->suspend_regs.fsta = readl(context->base + S3C2410_SDIFSTA);
|
||||
context->suspend_regs.imask = readl(context->base + S3C2440_SDIIMSK);
|
||||
-
|
||||
+
|
||||
spin_unlock_irqrestore(&context->lock, flags);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s3c24xx_hcd_resume(struct platform_device * pdev)
|
||||
-{
|
||||
+{
|
||||
struct s3c24xx_hcd_context * context = &hcd_context;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&context->lock, flags);
|
||||
-
|
||||
+
|
||||
writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
|
||||
writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
|
||||
writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
|
||||
--
|
||||
1.5.6.3
|
||||
|
||||
Reference in New Issue
Block a user