Merge gblack@m5.eecs.umich.edu:/bk/multiarch

[gem5.git] / dev / io_device.hh

diff --git a/dev/io_device.hh b/dev/io_device.hh
index 649706956e3157ea6c2d8f6042775ab06682c5af..bcfd062b964c98911d662c7d57352554f04f7e44 100644 (file)
--- a/dev/io_device.hh
+++ b/dev/io_device.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 The Regents of The University of Michigan
+ * Copyright (c) 2004-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 #ifndef __DEV_IO_DEVICE_HH__
 #define __DEV_IO_DEVICE_HH__
 
-#include "mem/functional_mem/functional_memory.hh"
+#include "mem/functional/functional.hh"
 
 class BaseInterface;
 class Bus;