public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390
       [not found] <11395671853420-git-send-email-apgo@patchbomb.org>
@ 2006-02-10 10:26 ` Arthur Othieno
  0 siblings, 0 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:26 UTC (permalink / raw)
  To: apgo; +Cc: Arthur Othieno, p_gortmaker, linux-kernel

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

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

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

6eca48257ddfe560447fda2c0c1961d78b06a047
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 599b68d..51e39dc 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -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)
-- 
1.1.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/4] input: 98kbd{,-io} and 98spkr removal, really.
  2006-02-10 10:27 [PATCH 0/4] PC98: remove remaining debris Arthur Othieno
  2006-02-10 10:27 ` [PATCH 1/4] block: floppy98 removal, really Arthur Othieno
@ 2006-02-10 10:27 ` Arthur Othieno
  2006-02-10 10:27 ` [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390 Arthur Othieno
  2006-02-10 10:27 ` [PATCH 3/4] sound: remove PC98-specific OPL3_HW_OPL3_PC98 Arthur Othieno
  3 siblings, 0 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:27 UTC (permalink / raw)
  To: akpm; +Cc: Arthur Othieno, linux-kernel

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

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

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

c35a909838076b3eb593c50a784b2f8604857441
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 6e0afbb..2708167 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -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
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 184c412..415c491 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -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
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index 678a859..4155197 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -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
-- 
1.1.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 1/4] block: floppy98 removal, really.
  2006-02-10 10:27 [PATCH 0/4] PC98: remove remaining debris Arthur Othieno
@ 2006-02-10 10:27 ` Arthur Othieno
  2006-02-10 10:27 ` [PATCH 2/4] input: 98kbd{,-io} and 98spkr " Arthur Othieno
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:27 UTC (permalink / raw)
  To: akpm; +Cc: Arthur Othieno, linux-kernel

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

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

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

80a4684b196db130039c8cd471f9dc10416da7db
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 3ec1f8d..410f259 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -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
-- 
1.1.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 0/4] PC98: remove remaining debris.
@ 2006-02-10 10:27 Arthur Othieno
  2006-02-10 10:27 ` [PATCH 1/4] block: floppy98 removal, really Arthur Othieno
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:27 UTC (permalink / raw)
  To: akpm; +Cc: linux-kernel, Arthur Othieno


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

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

 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(-)



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390
  2006-02-10 10:27 [PATCH 0/4] PC98: remove remaining debris Arthur Othieno
  2006-02-10 10:27 ` [PATCH 1/4] block: floppy98 removal, really Arthur Othieno
  2006-02-10 10:27 ` [PATCH 2/4] input: 98kbd{,-io} and 98spkr " Arthur Othieno
@ 2006-02-10 10:27 ` Arthur Othieno
  2006-02-10 10:27 ` [PATCH 3/4] sound: remove PC98-specific OPL3_HW_OPL3_PC98 Arthur Othieno
  3 siblings, 0 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:27 UTC (permalink / raw)
  To: akpm; +Cc: Arthur Othieno, p_gortmaker, linux-kernel

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

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

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

6eca48257ddfe560447fda2c0c1961d78b06a047
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 599b68d..51e39dc 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -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)
-- 
1.1.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/4] sound: remove PC98-specific OPL3_HW_OPL3_PC98
  2006-02-10 10:27 [PATCH 0/4] PC98: remove remaining debris Arthur Othieno
                   ` (2 preceding siblings ...)
  2006-02-10 10:27 ` [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390 Arthur Othieno
@ 2006-02-10 10:27 ` Arthur Othieno
  3 siblings, 0 replies; 6+ messages in thread
From: Arthur Othieno @ 2006-02-10 10:27 UTC (permalink / raw)
  To: akpm; +Cc: Arthur Othieno, perex, linux-kernel

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.

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>

---

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

96e21d8b6cccd08b82767d89f802a6e2356ee96b
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index 8339264..30936ab 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -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
-- 
1.1.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2006-02-10 10:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-10 10:27 [PATCH 0/4] PC98: remove remaining debris Arthur Othieno
2006-02-10 10:27 ` [PATCH 1/4] block: floppy98 removal, really Arthur Othieno
2006-02-10 10:27 ` [PATCH 2/4] input: 98kbd{,-io} and 98spkr " Arthur Othieno
2006-02-10 10:27 ` [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390 Arthur Othieno
2006-02-10 10:27 ` [PATCH 3/4] sound: remove PC98-specific OPL3_HW_OPL3_PC98 Arthur Othieno
     [not found] <11395671853420-git-send-email-apgo@patchbomb.org>
2006-02-10 10:26 ` [PATCH 4/4] net: remove CONFIG_NET_CBUS conditional for NS8390 Arthur Othieno

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox