mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 22:02:27 +02:00
remove-pm_legacy-include
Signed-off-by: Xiangfu Liu <xiangfu.z@gmail.com>
This commit is contained in:
Xiangfu Liu
Xiangfu Liu
parent
6e396b6164
commit
8b575df0de
@ -1,14 +1,87 @@
|
||||
From 7ffdc4a4a3640440674ccbee9a670f3b283ca9fc Mon Sep 17 00:00:00 2001
|
||||
From: Xiangfu Liu <xiangfu.z@gmail.com>
|
||||
Date: Fri, 17 Jul 2009 13:32:23 +0800
|
||||
Subject: [PATCH] fix-old-define.patch
|
||||
diff --git a/arch/mips/jz4730/pm.c b/arch/mips/jz4730/pm.c
|
||||
index 9ea71c4..2e0a295 100644
|
||||
--- a/arch/mips/jz4730/pm.c
|
||||
+++ b/arch/mips/jz4730/pm.c
|
||||
@@ -14,7 +14,6 @@
|
||||
|
||||
---
|
||||
drivers/mmc/host/jz_mmc.c | 20 +++++++++++++-------
|
||||
drivers/video/jzlcd.c | 5 ++---
|
||||
drivers/video/jzlcd.h | 1 -
|
||||
3 files changed, 15 insertions(+), 11 deletions(-)
|
||||
#include <linux/init.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/sysctl.h>
|
||||
diff --git a/arch/mips/jz4740/pm.c b/arch/mips/jz4740/pm.c
|
||||
index 8ad2a57..6f96bdc 100644
|
||||
--- a/arch/mips/jz4740/pm.c
|
||||
+++ b/arch/mips/jz4740/pm.c
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/proc_fs.h>
|
||||
diff --git a/arch/mips/jz4750/pm.c b/arch/mips/jz4750/pm.c
|
||||
index a1e935c..1a768f2 100644
|
||||
--- a/arch/mips/jz4750/pm.c
|
||||
+++ b/arch/mips/jz4750/pm.c
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/proc_fs.h>
|
||||
diff --git a/arch/mips/jz4750d/pm.c b/arch/mips/jz4750d/pm.c
|
||||
index b8cb4a8..0c2899e 100644
|
||||
--- a/arch/mips/jz4750d/pm.c
|
||||
+++ b/arch/mips/jz4750d/pm.c
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/proc_fs.h>
|
||||
diff --git a/drivers/char/jzchar/ak4182.c b/drivers/char/jzchar/ak4182.c
|
||||
index f4a970f..f2ec9a8 100644
|
||||
--- a/drivers/char/jzchar/ak4182.c
|
||||
+++ b/drivers/char/jzchar/ak4182.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/poll.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/irq.h>
|
||||
diff --git a/drivers/char/jzchar/poweroff.c b/drivers/char/jzchar/poweroff.c
|
||||
index 7127438..4970b68 100644
|
||||
--- a/drivers/char/jzchar/poweroff.c
|
||||
+++ b/drivers/char/jzchar/poweroff.c
|
||||
@@ -24,7 +24,6 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
diff --git a/drivers/mmc/host/jz4750_mmc.c b/drivers/mmc/host/jz4750_mmc.c
|
||||
index c3bae83..a19cd15 100644
|
||||
--- a/drivers/mmc/host/jz4750_mmc.c
|
||||
+++ b/drivers/mmc/host/jz4750_mmc.c
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/signal.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <linux/scatterlist.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
diff --git a/drivers/mmc/host/jz_mmc.c b/drivers/mmc/host/jz_mmc.c
|
||||
index 67781da..971dbe0 100644
|
||||
--- a/drivers/mmc/host/jz_mmc.c
|
||||
@ -85,6 +158,30 @@ index 67781da..971dbe0 100644
|
||||
#else
|
||||
#define jz_mmc_suspend NULL
|
||||
#define jz_mmc_resume NULL
|
||||
diff --git a/drivers/video/jz4740_slcd.c b/drivers/video/jz4740_slcd.c
|
||||
index 0d893a4..450e233 100644
|
||||
--- a/drivers/video/jz4740_slcd.c
|
||||
+++ b/drivers/video/jz4740_slcd.c
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <asm/pgtable.h>
|
||||
diff --git a/drivers/video/jz4750_lcd.c b/drivers/video/jz4750_lcd.c
|
||||
index 5350a70..95da4cd 100644
|
||||
--- a/drivers/video/jz4750_lcd.c
|
||||
+++ b/drivers/video/jz4750_lcd.c
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <asm/pgtable.h>
|
||||
diff --git a/drivers/video/jzlcd.c b/drivers/video/jzlcd.c
|
||||
index 4f729f9..172d5b2 100644
|
||||
--- a/drivers/video/jzlcd.c
|
||||
@ -123,6 +220,63 @@ index 45def90..3414c5d 100644
|
||||
#define PWM_CHN 4 /* pwm channel */
|
||||
#define PWM_FULL 101
|
||||
/* 100 level: 0,1,...,100 */
|
||||
--
|
||||
1.6.0.4
|
||||
|
||||
diff --git a/sound/oss/jz_i2s.c b/sound/oss/jz_i2s.c
|
||||
index 3ed6d3f..f34b50e 100644
|
||||
--- a/sound/oss/jz_i2s.c
|
||||
+++ b/sound/oss/jz_i2s.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <sound/driver.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
diff --git a/sound/oss/jz_i2s_4750.c b/sound/oss/jz_i2s_4750.c
|
||||
index 555d9fb..9dba0cc 100644
|
||||
--- a/sound/oss/jz_i2s_4750.c
|
||||
+++ b/sound/oss/jz_i2s_4750.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <sound/driver.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
diff --git a/sound/oss/jz_i2s_dlv_dma_test.c b/sound/oss/jz_i2s_dlv_dma_test.c
|
||||
index 41c10bd..e9a107a 100644
|
||||
--- a/sound/oss/jz_i2s_dlv_dma_test.c
|
||||
+++ b/sound/oss/jz_i2s_dlv_dma_test.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <sound/driver.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
diff --git a/sound/oss/jz_i2s_for_4750.c b/sound/oss/jz_i2s_for_4750.c
|
||||
index b58ae4d..5465299 100644
|
||||
--- a/sound/oss/jz_i2s_for_4750.c
|
||||
+++ b/sound/oss/jz_i2s_for_4750.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <sound/driver.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
diff --git a/sound/oss/jz_pcm_tlv320aic1106_dma.c b/sound/oss/jz_pcm_tlv320aic1106_dma.c
|
||||
index 2255e08..34d4887 100644
|
||||
--- a/sound/oss/jz_pcm_tlv320aic1106_dma.c
|
||||
+++ b/sound/oss/jz_pcm_tlv320aic1106_dma.c
|
||||
@@ -17,7 +17,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
-#include <linux/pm_legacy.h>
|
||||
#include <sound/driver.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user