Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

arch/sparc64/kernel/pci_common.c

@@ -78,20 +78,6 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm,
 	return 0;
 }
 
-/* Remove a PCI device from the device trees, then
- * free it up.  Note that this must run before
- * the device's resources are registered because we
- * do not handle unregistering them here.
- */
-static void pci_device_delete(struct pci_dev *pdev)
-{
-	list_del(&pdev->global_list);
-	list_del(&pdev->bus_list);
-
-	/* Ok, all references are gone, free it up. */
-	kfree(pdev);
-}
-
 /* Older versions of OBP on PCI systems encode 64-bit MEM
  * space assignments incorrectly, this fixes them up.  We also
  * take the opportunity here to hide other kinds of bogus
@@ -164,7 +150,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,
 		 * second EBUS/HappyMeal pair if the external
 		 * connector for it is not present.
 		 */
-		pci_device_delete(pdev);
+		pci_remove_bus_device(pdev);
 		return;
 	}
 

drivers/video/Makefile

@@ -70,9 +70,6 @@ obj-$(CONFIG_FB_E1355)            += epson1355fb.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 
-# One by one these are being converted over to the new APIs
-#obj-$(CONFIG_FB_LEO)              += leofb.o sbusfb.o
-
 obj-$(CONFIG_FB_FFB)               += ffb.o sbuslib.o cfbimgblt.o cfbcopyarea.o
 obj-$(CONFIG_FB_CG6)               += cg6.o sbuslib.o cfbimgblt.o cfbcopyarea.o
 obj-$(CONFIG_FB_CG3)               += cg3.o sbuslib.o cfbimgblt.o cfbcopyarea.o \
@@ -85,6 +82,8 @@ obj-$(CONFIG_FB_P9100)             += p9100.o sbuslib.o cfbimgblt.o cfbcopyarea.
 				      cfbfillrect.o
 obj-$(CONFIG_FB_TCX)               += tcx.o sbuslib.o cfbimgblt.o cfbcopyarea.o \
 				      cfbfillrect.o
+obj-$(CONFIG_FB_LEO)               += leo.o sbuslib.o cfbimgblt.o cfbcopyarea.o \
+				      cfbfillrect.o
 
 # Files generated that shall be removed upon make clean
 clean-files := promcon_tbl.c

drivers/video/fbmem.c

@@ -158,6 +158,8 @@ extern int p9100_init(void);
 extern int p9100_setup(char*);
 extern int tcx_init(void);
 extern int tcx_setup(char*);
+extern int leo_init(void);
+extern int leo_setup(char*);
 
 static struct {
 	const char *name;
@@ -270,6 +272,9 @@ static struct {
 #ifdef CONFIG_FB_TCX
 	{ "tcx", tcx_init, tcx_setup },
 #endif
+#ifdef CONFIG_FB_LEO
+	{ "leo", leo_init, leo_setup },
+#endif
 
 	/*
 	 * Generic drivers that are used as fallbacks

include/asm-sparc/termios.h

@@ -92,7 +92,7 @@ struct winsize {
 	reprint=^R	discard=^U	werase=^W	lnext=^V
 	vmin=\1         vtime=\0
 */
-#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001\000"
+#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001"
 
 /*
  * Translate a "termio" structure into a "termios". Ugh.

include/asm-sparc64/termios.h

@@ -91,7 +91,7 @@ struct winsize {
 	reprint=^R	discard=^U	werase=^W	lnext=^V
 	vmin=\1         vtime=\0
 */
-#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001\000"
+#define INIT_C_CC "\003\034\177\025\004\000\000\000\021\023\032\031\022\025\027\026\001"
 
 /*
  * Translate a "termio" structure into a "termios". Ugh.