Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.352.2.2
retrieving revision 1.353
diff -u -p -r1.352.2.2 -r1.353
--- src/sys/arch/alpha/conf/GENERIC	2014/05/18 17:44:53	1.352.2.2
+++ src/sys/arch/alpha/conf/GENERIC	2013/06/30 21:38:55	1.353
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.352.2.2 2014/05/18 17:44:53 rmind Exp $
+# $NetBSD: GENERIC,v 1.353 2013/06/30 21:38:55 rmind Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.352.2.2 $"
+ident		"GENERIC-$Revision: 1.353 $"
 
 maxusers 32
 
@@ -225,8 +225,6 @@ mcmem*	at	mcbus? mid ?
 #EV6 Tsunami Core Logic
 
 tsc*	at	mainbus0
-tsciic* 	at	tsc?
-iic* 	at	tsciic?
 
 # DECpc AXP150 (Jensen) internal bus support
 jensenio* at	mainbus0
@@ -314,7 +312,6 @@ adw*	at	pci? dev ? function ?		# AdvanSy
 #options 	SCSI_ADW_TAGQ_DISABLE		# 	disable Tag Queuing
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 autri*	at	pci? dev ? function ?		# Trident 4DWAVE based AC'97 Audio
-bge*	at	pci? dev ? function ?		# Broadcom 570x gigabit Ethernet
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
 cmpci*	at	pci? dev ? function ?		# C-Media CMI8338/8738 Audio
@@ -361,8 +358,6 @@ pcn*	at	pci? dev ? function ?		# AMD PCn
 pcscp*	at	pci? dev ? function ?		# AMD Am53c974 PCscsi-PCI
 ppb*	at	pci? dev ? function ?		# PCI-PCI Bridges
 puc*	at 	pci? dev ? function ?		# PCI "universal" comm. cards
-radeonfb* at	pci? dev ? function ?		# ATI/AMD Radeon Graphics
-options 	RADEONFB_DEPTH_32
 re*	at	pci? dev ? function ?		# Realtek 8169 Ethernet
 rtk*	at	pci? dev ? function ?		# Realtek 8129/8139 Ethernet
 sio*	at	pci? dev ? function ?		# Intel PCI-ISA Bridges
@@ -382,13 +377,11 @@ yds*	at	pci? dev ? function ?		# Yamaha 
 
 opl*	at	cmpci? flags 1
 opl*	at	eso?
-opl*	at	sb?
 #opl*	at	sv?
 opl*	at	yds?
 
 mpu*	at	cmpci?
 mpu*	at	eso?
-mpu*	at	sb?
 mpu*	at	yds?
 
 # I2O devices
@@ -542,25 +535,6 @@ fd*	at	fdc? drive ?
 ld*	at	cac? unit ?
 ld*	at	mlx? unit ?
 
-# Acer Labs M7101 SMBus controller
-alipm* 	at pci? dev ? function ?
-iic* 	at alipm?
-
-# AlphaServer DS20L i2c devices
-#lmenv* 	at iic? addr 0x2c
-#lmenv* 	at iic? addr 0x2d
-#lmenv* 	at iic? addr 0x2e
-#lmenv* 	at iic? addr 0x2f
-#spdmem* 	at iic? addr 0x50
-#spdmem* 	at iic? addr 0x51
-#spdmem* 	at iic? addr 0x52
-#spdmem* 	at iic? addr 0x53
-#spdmem* 	at iic? addr 0x54
-#spdmem* 	at iic? addr 0x55
-#spdmem* 	at iic? addr 0x56
-#spdmem* 	at iic? addr 0x57
-#seeprom* 	at iic0 addr 0x51 flags 0x2
-
 # PCMCIA USB controllers
 slhci*	at pcmcia? function ?			# ScanLogic SL811HS
 
@@ -698,7 +672,6 @@ btsco* at bthub?
 audio*	at audiobus?
 midi*	at midibus?
 midi*	at pcppi?
-midi*	at sb?
 
 # Workstation Console attachments
 wsdisplay*	at	cfb?
@@ -708,7 +681,6 @@ wsdisplay*	at	sfb?
 #wsdisplay*	at	sfbp?
 wsdisplay*	at	px?
 wsdisplay*	at	pxg?
-wsdisplay*	at	radeonfb?
 wsdisplay*	at	vga?
 wsdisplay*	at	tga?
 wskbd*		at	lkkbd? console ?