← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/alpha/include/asm/machvec.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/alpha/include/asm/machvec.h
33
33
 
34
34
        int nr_irqs;
35
35
        int rtc_port;
 
36
        int rtc_boot_cpu_only;
36
37
        unsigned int max_asn;
37
38
        unsigned long max_isa_dma_address;
38
39
        unsigned long irq_probe_mask;
95
96
 
96
97
        struct _alpha_agp_info *(*agp_info)(void);
97
98
 
98
 
        unsigned int (*rtc_get_time)(struct rtc_time *);
99
 
        int (*rtc_set_time)(struct rtc_time *);
100
 
 
101
99
        const char *vector_name;
102
100
 
103
101
        /* NUMA information */
126
124
 
127
125
#ifdef CONFIG_ALPHA_GENERIC
128
126
extern int alpha_using_srm;
129
 
#else
130
 
#ifdef CONFIG_ALPHA_SRM
131
 
#define alpha_using_srm 1
132
 
#else
133
 
#define alpha_using_srm 0
134
 
#endif
 
127
extern int alpha_using_qemu;
 
128
#else
 
129
# ifdef CONFIG_ALPHA_SRM
 
130
#  define alpha_using_srm 1
 
131
# else
 
132
#  define alpha_using_srm 0
 
133
# endif
 
134
# ifdef CONFIG_ALPHA_QEMU
 
135
#  define alpha_using_qemu 1
 
136
# else
 
137
#  define alpha_using_qemu 0
 
138
# endif
135
139
#endif /* GENERIC */
136
140
 
137
 
#endif
 
141
#endif /* __KERNEL__ */
138
142
#endif /* __ALPHA_MACHVEC_H */