Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

[linux-2.6-omap-h63xx.git] / arch / s390 / appldata / appldata.h

diff --git a/arch/s390/appldata/appldata.h b/arch/s390/appldata/appldata.h
index 0429481dea633b9fe2bffb6aff2e50d6f60d6857..db3ae8505103812a49b0d7e5a675251ec005f928 100644 (file)
--- a/arch/s390/appldata/appldata.h
+++ b/arch/s390/appldata/appldata.h
@@ -21,8 +21,7 @@
 #define APPLDATA_RECORD_NET_SUM_ID     0x03    /* must be < 256 !     */
 #define APPLDATA_RECORD_PROC_ID                0x04
 
-#define CTL_APPLDATA           2120    /* sysctl IDs, must be unique */
-#define CTL_APPLDATA_TIMER     2121
+#define CTL_APPLDATA_TIMER     2121    /* sysctl IDs, must be unique */
 #define CTL_APPLDATA_INTERVAL  2122
 #define CTL_APPLDATA_MEM       2123
 #define CTL_APPLDATA_OS                2124
@@ -46,7 +45,6 @@ struct appldata_ops {
        int    active;                          /* monitoring status */
 
        /* fill in from here */
-       unsigned int ctl_nr;                    /* sysctl ID */
        char name[APPLDATA_PROC_NAME_LENGTH];   /* name of /proc fs node */
        unsigned char record_nr;                /* Record Nr. for Product ID */
        void (*callback)(void *data);           /* callback function */