[kernel] r11649 - dists/trunk/linux-2.6/debian/patches/features/arm

[Martin Michlmayr]

Author: tbm
Date: Mon Jun 16 21:08:50 2008
New Revision: 11649

Log:
mv2120 doesn't use pci


Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch	Mon Jun 16 21:08:50 2008
@@ -31,10 +31,9 @@
 +obj-$(CONFIG_MACH_TS209)	+= ts209-setup.o tsx09-common.o
 +obj-$(CONFIG_MACH_TS409)	+= ts409-setup.o tsx09-common.o
 +obj-$(CONFIG_MACH_MV2120)	+= mv2120-setup.o
-diff -uprN -X dontdiff linux-2.6.26-rc6/arch/arm/mach-orion5x/mv2120-setup.c linux-2.6.26-rc6_new/arch/arm/mach-orion5x/mv2120-setup.c
---- linux-2.6.26-rc6/arch/arm/mach-orion5x/mv2120-setup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.26-rc6_new/arch/arm/mach-orion5x/mv2120-setup.c	2008-06-15 14:56:09.000000000 +0200
-@@ -0,0 +1,236 @@
+--- /dev/null	2008-06-15 07:07:41.000000000 +0000
++++ b/arch/arm/mach-orion5x/mv2120-setup.c	2008-06-16 21:07:21.000000000 +0000
+@@ -0,0 +1,227 @@
 +/*
 + * Copyright (C) 2007 Herbert Valerio Riedel <hvr at gnu.org>
 + * Copyright (C) 2008 Martin Michlmayr <tbm at cyrius.com>
@@ -100,15 +99,6 @@
 +	.map_irq	= mv2120_pci_map_irq,
 +};
 +
-+static int __init mv2120_pci_init(void)
-+{
-+	if (machine_is_mv2120())
-+		pci_common_init(&mv2120_pci);
-+
-+	return 0;
-+}
-+subsys_initcall(mv2120_pci_init);
-+
 +
 +/*****************************************************************************
 + * Ethernet