|
From: NIIBE Y. <gn...@m1...> - 2001-12-11 05:42:56
|
Paul Mundt wrote: > Things like pvr2fb and the AICA RTC code are already in mainline. Maple is > currently undergoing a rewrite, and hopefully we'll be able to replace the > current implementation with that shortly. The current maple implementation > should never leave this tree. > > As far as GD-ROM support goes.. that's pending a proper implementation as > well, since the current driver isn't anything other then a hack of a port o= > f a > hack of a driver from NetBSD.. > > Are there any other drivers you were referring to that I missed? Following files: drivers/cdrom/gdrom.c drivers/char/dc_keyb.c drivers/char/joystick/maplecontrol.c drivers/char/maple_keyb.c drivers/char/maplemouse.c drivers/maple/Config.in drivers/maple/Makefile drivers/maple/maple.c include/linux/maple.h Without maple implementation, maplecontrol.c, maple_keyb.c and maplemouse.c have nonsence. So, we leave the files above in our tree, not sending to mainline, OK? Here is diffstats output for the divergence between 2.4.16 and our 2.4 based tree (with no files above). -------------------------- arch/sh/kernel/sys_sh.c-1.7 | 236 ++++++++++ Documentation/sh/new-machine.txt | 77 +++ include/asm-sh/mmzone.h | 61 ++ drivers/mtd/maps/solutionengine.c | 47 +- include/asm-sh/stat.h | 25 - drivers/net/8139too.c | 25 + drivers/mtd/mtdpart.c | 11 drivers/mtd/maps/Config.in | 11 arch/sh/kernel/io_7751se.c | 8 include/linux/mtd/partitions.h | 7 drivers/pci/pci.ids | 7 drivers/char/shwdt.c | 7 arch/sh/kernel/traps.c | 7 include/asm-sh/segment.h | 6 Documentation/Configure.help | 6 include/asm-sh/pci.h | 5 drivers/char/joystick/Config.in | 5 drivers/char/Makefile | 5 init/main.c | 3 include/linux/input.h | 3 include/asm-sh/uaccess.h | 3 drivers/net/Config.in | 3 drivers/Makefile | 3 mm/memory.c | 2 include/asm-sh/namei.h | 2 include/asm-sh/linux_logo.h | 2 include/asm-sh/keyboard.h | 2 include/asm-sh/ioctl.h | 2 include/asm-sh/io_dc.h | 2 include/asm-sh/hitachi_se.h | 2 include/asm-sh/hd64465_gpio.h | 2 include/asm-sh/hd64465.h | 2 include/asm-sh/hd64461.h | 2 include/asm-sh/cache.h | 2 drivers/video/hitfb.c | 2 drivers/pcmcia/hd64465_ss.c | 2 drivers/char/sh-sci.h | 2 drivers/char/sh-sci.c | 2 drivers/char/scan_keyb.c | 2 drivers/char/joystick/Makefile | 2 drivers/char/hp600_keyb.c | 2 arch/sh/vmlinux.lds.S | 2 arch/sh/mm/ioremap.c | 2 arch/sh/mm/init.c | 2 arch/sh/mm/fault.c | 2 arch/sh/mm/extable.c | 2 arch/sh/mm/copy_page.S | 2 arch/sh/mm/clear_page.S | 2 arch/sh/mm/cache-sh4.c | 2 arch/sh/mm/cache-sh3.c | 2 arch/sh/mm/__copy_user_page-sh4.S | 2 arch/sh/mm/__clear_user_page-sh4.S | 2 arch/sh/lib/strlen.S | 2 arch/sh/lib/memset.S | 2 arch/sh/lib/memmove.S | 2 arch/sh/lib/memcpy.S | 2 arch/sh/lib/memchr.S | 2 arch/sh/lib/checksum.S | 2 arch/sh/kernel/time.c | 2 arch/sh/kernel/signal.c | 2 arch/sh/kernel/sh_bios.c | 2 arch/sh/kernel/setup_se.c | 2 arch/sh/kernel/setup_hd64465.c | 2 arch/sh/kernel/setup_hd64461.c | 2 arch/sh/kernel/setup_cqreek.c | 2 arch/sh/kernel/setup.c | 2 arch/sh/kernel/ptrace.c | 2 arch/sh/kernel/process.c | 2 arch/sh/kernel/pcibios.c | 2 arch/sh/kernel/pci-sh7751.c | 2 arch/sh/kernel/pci-dc.c | 2 arch/sh/kernel/mach_dc.c | 2 arch/sh/kernel/irq_ipr.c | 2 arch/sh/kernel/irq_imask.c | 2 arch/sh/kernel/irq.c | 2 arch/sh/kernel/io_se.c | 2 arch/sh/kernel/io_hd64465.c | 2 arch/sh/kernel/io_hd64461.c | 2 arch/sh/kernel/io_generic.c | 2 arch/sh/kernel/io_dc.c | 2 arch/sh/kernel/head.S | 2 arch/sh/kernel/hd64465_gpio.c | 2 arch/sh/kernel/fpu.c | 2 arch/sh/kernel/entry.S | 2 arch/sh/kernel/cf-enabler.c | 2 arch/sh/config.in | 2 arch/sh/Makefile | 2 Documentation/cachetlb.txt | 2 kernel/ptrace.c | 1 include/linux/highmem.h | 1 drivers/cdrom/Makefile | 1 drivers/cdrom/Config.in | 1 drivers/block/rd.c | 1 arch/sh/kernel/pci-7751se.c | 1 Makefile | 1 -- |