[kernel] r8595 - in dists/trunk/linux-2.6/debian: . patches/bugfix/m68k

[Christian T. Steigies]

Author: cts
Date: Thu May 17 16:10:03 2007
New Revision: 8595

Log:
fix atari-scc patch and m68k install target


Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/m68k/633-atari_scc.diff
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/m68k/633-atari_scc.diff
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/m68k/633-atari_scc.diff	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/m68k/633-atari_scc.diff	Thu May 17 16:10:03 2007
@@ -23,11 +23,11 @@
  drivers/char/atari_scc.c | 1701 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 1702 insertions(+)
 
---- linux-m68k-2.6.21.orig/drivers/char/Makefile
-+++ linux-m68k-2.6.21/drivers/char/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_DIGIEPCA)		+= epca.o
- obj-$(CONFIG_SPECIALIX)		+= specialix.o
+--- linux-2.6-2.6.21.orig/drivers/char/Makefile	2007-05-17 17:59:28.000000000 +0200
++++ linux-2.6-2.6.21/drivers/char/Makefile	2007-05-17 18:00:10.000000000 +0200
+@@ -30,6 +30,7 @@
  obj-$(CONFIG_MOXA_INTELLIO)	+= moxa.o
+ obj-$(CONFIG_SIBYTE_SB1250_DUART)	+= sb1250_duart.o
  obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
 +obj-$(CONFIG_ATARI_SCC)		+= atari_scc.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Thu May 17 16:10:03 2007
@@ -422,8 +422,10 @@
 install-image-i386-$(SUBARCH)-$(FLAVOUR)-plain_image:
 	cp '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
-install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image \
 install-image-m68k-$(SUBARCH)-$(FLAVOUR)-plain_image:
+	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+
+install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 
 install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image: