Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 1 deletions

diff --git a/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java b/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
index 917064f5446..df8a5453f15 100644
--- a/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
+++ b/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
@@ -40,6 +40,7 @@ package javax.print.attribute.standard;
 
 import java.util.Locale;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
@@ -98,7 +99,7 @@ public final class OutputDeviceAssigned extends TextSyntax
    *
    * @return The class <code>OutputDeviceAssigned</code> itself.
    */
-  public Class getCategory()
+  public Class< ? extends Attribute> getCategory()
   {
     return OutputDeviceAssigned.class;
   }