aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-04-28 10:23:36 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-04-28 10:23:36 +0000
commit68943e35c20ef56e58304fd22e04eee19976af8b (patch)
treed310ebc2172f36bc22faab0320c21b808009e8f0 /target/linux/generic-2.6
parent99969dcfface9a1a9c6697b74fa58d20111fa47a (diff)
downloadupstream-68943e35c20ef56e58304fd22e04eee19976af8b.tar.gz
upstream-68943e35c20ef56e58304fd22e04eee19976af8b.tar.bz2
upstream-68943e35c20ef56e58304fd22e04eee19976af8b.zip
upgrade to 2.6.24.5
SVN-Revision: 10959
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch17
1 files changed, 1 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
index 2aff3a7aeb..d31c2bb803 100644
--- a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
@@ -49955,21 +49955,6 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c p
/* keep the reference to the root node */
}
-@@ -354,7 +354,7 @@
- * mode as well. The same fixup must be done to the class-code property in
- * the IDE node /pci@80000000/ide@C,1
- */
--static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
-+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
- {
- u8 progif;
- struct pci_dev *viaisa;
-@@ -375,4 +375,4 @@
-
- pci_dev_put(viaisa);
- }
--DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c powerpc.git/arch/powerpc/platforms/chrp/setup.c
--- linux-2.6.24/arch/powerpc/platforms/chrp/setup.c 2008-01-24 23:58:37.000000000 +0100
+++ powerpc.git/arch/powerpc/platforms/chrp/setup.c 2008-01-28 20:25:49.000000000 +0100
@@ -64602,7 +64587,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
EXPORT_SYMBOL(pmu_suspend);
EXPORT_SYMBOL(pmu_resume);
EXPORT_SYMBOL(pmu_unlock);
--#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
+-#if defined(CONFIG_PPC32)
+#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
EXPORT_SYMBOL(pmu_enable_irled);
EXPORT_SYMBOL(pmu_battery_count);