Skip to contentSkip to conversation

PC98: remove remaining debris.

PATCH New Arthur Othieno 1 participant 5 messages Feb 10, 2006

Subsystems (4)
lore
Share & tools
lore
#3 lore raw

PATCH 3/4 sound: remove PC98-specific OPL3_HW_OPL3_PC98

In reply to Arthur Othieno

OPL3_HW_OPL3_PC98 #define isn't used anywhere; previously in sound/drivers/opl3/opl3_lib.c and sound/isa/cs423x/pc98.c, the latter of which went away with the rest of PC98 subarch.

---

 include/sound/opl3.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

96e21d8b6cccd08b82767d89f802a6e2356ee96b

include/sound/opl3.h +0 -1
index 8339264..30936ab 100644
@@ -229,7 +229,6 @@
 #define OPL3_HW_OPL3_CS		0x0302	/* CS4232/CS4236+ */
 #define OPL3_HW_OPL3_FM801	0x0303	/* FM801 */
 #define OPL3_HW_OPL3_CS4281	0x0304	/* CS4281 */
-#define OPL3_HW_OPL3_PC98	0x0305	/* PC9800 */
 #define OPL3_HW_OPL4		0x0400	/* YMF278B/YMF295 */
 #define OPL3_HW_OPL4_ML		0x0401	/* YMF704/YMF721 */
 #define OPL3_HW_MASK		0xff00
Signature · 1 line
1.1.5
#0 lore raw

cover PC98: remove remaining debris.

PC98 subarch died a messy one. Cleanup misc remaining debris. Changelog within.

---

 drivers/block/Makefile          |    1 -
 drivers/input/keyboard/Makefile |    1 -
 drivers/input/misc/Makefile     |    1 -
 drivers/input/serio/Makefile    |    1 -
 drivers/net/8390.h              |    2 +-
 include/sound/opl3.h            |    1 -
 6 files changed, 1 insertion(+), 6 deletions(-)
#1 lore raw

PATCH 1/4 block: floppy98 removal, really.

floppy98 went out together with the rest of PC98 subarch. Remove stale Makefile entry that remained.

---

 drivers/block/Makefile |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

80a4684b196db130039c8cd471f9dc10416da7db

drivers/block/Makefile +0 -1
index 3ec1f8d..410f259 100644
@@ -7,7 +7,6 @@
 
 obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
 obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o
-obj-$(CONFIG_BLK_DEV_FD98)	+= floppy98.o
 obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o
 obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
 obj-$(CONFIG_BLK_DEV_SWIM_IOP)	+= swim_iop.o
Signature · 1 line
1.1.5
#2 lore raw

PATCH 2/4 input: 98kbd{,-io} and 98spkr removal, really.

In reply to Arthur Othieno

98kbd{,-io} and 98spkr all went out with PC98 subarch. Remove stale Makefile entries that remained.

---

 drivers/input/keyboard/Makefile |    1 -
 drivers/input/misc/Makefile     |    1 -
 drivers/input/serio/Makefile    |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

c35a909838076b3eb593c50a784b2f8604857441

drivers/input/keyboard/Makefile +0 -1
index 6e0afbb..2708167 100644
@@ -11,7 +11,6 @@ obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
 obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o
 obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locomokbd.o
 obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o
-obj-$(CONFIG_KEYBOARD_98KBD)		+= 98kbd.o
 obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
 obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
 obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
drivers/input/misc/Makefile +0 -1
index 184c412..415c491 100644
@@ -7,7 +7,6 @@
 obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcspkr.o
 obj-$(CONFIG_INPUT_PCSPKR)		+= pcspkr.o
 obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o
-obj-$(CONFIG_INPUT_98SPKR)		+= 98spkr.o
 obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
 obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
drivers/input/serio/Makefile +0 -1
index 678a859..4155197 100644
@@ -13,7 +13,6 @@ obj-$(CONFIG_SERIO_RPCKBD)	+= rpckbd.o
 obj-$(CONFIG_SERIO_SA1111)	+= sa1111ps2.o
 obj-$(CONFIG_SERIO_AMBAKMI)	+= ambakmi.o
 obj-$(CONFIG_SERIO_Q40KBD)	+= q40kbd.o
-obj-$(CONFIG_SERIO_98KBD)	+= 98kbd-io.o
 obj-$(CONFIG_SERIO_GSCPS2)	+= gscps2.o
 obj-$(CONFIG_HP_SDC)		+= hp_sdc.o
 obj-$(CONFIG_HIL_MLC)		+= hp_sdc_mlc.o hil_mlc.o
Signature · 1 line
1.1.5
#4 lore raw

PATCH 4/4 net: remove CONFIG_NET_CBUS conditional for NS8390

In reply to Arthur Othieno

Don't bother testing for CONFIG_NET_CBUS ("NEC PC-9800 C-bus cards"); it went out with the rest of PC98 subarch.

---

 drivers/net/8390.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

6eca48257ddfe560447fda2c0c1961d78b06a047

drivers/net/8390.h +1 -1
index 599b68d..51e39dc 100644
@@ -134,7 +134,7 @@ struct ei_device {
 #define inb_p(_p)	inb(_p)
 #define outb_p(_v,_p)	outb(_v,_p)
 
-#elif defined(CONFIG_NET_CBUS) || defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
+#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
 #define EI_SHIFT(x)	(ei_local->reg_offset[x])
 #else
 #define EI_SHIFT(x)	(x)
Signature · 1 line
1.1.5