From c675ce7df5ba53361581ba92041ba6fc485bc445 Mon Sep 17 00:00:00 2001
From: Ryan Holtz <rholtz@batcountryentertainment.com>
Date: Sat, 28 Aug 2010 17:14:12 +0000
Subject: [PATCH] Fix for class derivation issues brought about by pain meds. 
 No whatsnew.

---
 src/emu/machine/6526cia.c | 2 +-
 src/emu/machine/6526cia.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index fbdcee7dd5a..37e8b61af28 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -43,7 +43,7 @@
 
 #define MOS6526_DEV_DERIVED_CTOR(devtype) \
 	devtype##_device::devtype##_device(running_machine &_machine, const devtype##_device_config &config) \
-		: timekeeper_device(_machine, config) \
+		: mos6526_device(_machine, config) \
 	{ }
 
 #define MOS6526_DEVCFG_DERIVED_CTOR(devtype, name) \
diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h
index 7868a67e8d8..f8fe109ad3d 100644
--- a/src/emu/machine/6526cia.h
+++ b/src/emu/machine/6526cia.h
@@ -36,7 +36,7 @@
 #define __6526CIA_H__
 
 #include "emu.h"
-
+#include "devhelpr.h"
 
 
 	//**************************************************************************
@@ -93,8 +93,9 @@ class mos6526_device_config :   public device_config,
 {
     friend class mos6526_device;
 
+protected:
     // construction/destruction
-    mos6526_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock);
+    mos6526_device_config(const machine_config &mconfig, const char *type, const char *tag, const device_config *owner, UINT32 clock);
 
 public:
     // allocators
@@ -115,6 +116,7 @@ class mos6526_device :  public device_t
     friend class mos6526_device_config;
     friend class dart_channel;
 
+protected:
     // construction/destruction
     mos6526_device(running_machine &_machine, const mos6526_device_config &_config);
 
@@ -225,6 +227,9 @@ private:
     const mos6526_device_config &m_config;
 };
 
+GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos6526r1)
+GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos6526r2)
+GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos8520)
 
 // device type definition
 extern const device_type MOS6526R1;