← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/avr32/include/uapi/asm/socket.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/avr32/include/uapi/asm/socket.h
1
 
#ifndef __ASM_AVR32_SOCKET_H
2
 
#define __ASM_AVR32_SOCKET_H
 
1
#ifndef _UAPI__ASM_AVR32_SOCKET_H
 
2
#define _UAPI__ASM_AVR32_SOCKET_H
3
3
 
4
4
#include <asm/sockios.h>
5
5
 
76
76
 
77
77
#define SO_BUSY_POLL            46
78
78
 
79
 
#endif /* __ASM_AVR32_SOCKET_H */
 
79
#define SO_MAX_PACING_RATE      47
 
80
 
 
81
#endif /* _UAPI__ASM_AVR32_SOCKET_H */