[svn-commits] sruffell: branch linux/sruffell/dahdi-transcoder r4716 - in /linux/team/sruff...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Aug 6 12:22:51 CDT 2008


Author: sruffell
Date: Wed Aug  6 12:22:50 2008
New Revision: 4716

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4716
Log:
Merged revisions 4712-4713 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
r4712 | kpfleming | 2008-08-06 08:05:25 -0700 (Wed, 06 Aug 2008) | 1 line

more license header updates
........
r4713 | kpfleming | 2008-08-06 08:18:45 -0700 (Wed, 06 Aug 2008) | 3 lines

change some ioctls that don't actually use a parameter to be defined that way


........

Modified:
    linux/team/sruffell/dahdi-transcoder/   (props changed)
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec_user.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/vpm450m.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/wct4xxp.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakApi.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakCust.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakHpi.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakErrs.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakenum.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakApi.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakErrs.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakHpi.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/gpakenum.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/vpmadt032.h
    linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/wcte12xp.h
    linux/team/sruffell/dahdi-transcoder/include/dahdi/user.h

Propchange: linux/team/sruffell/dahdi-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug  6 12:22:50 2008
@@ -1,1 +1,1 @@
-/linux/trunk:1-4711
+/linux/trunk:1-4715

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec.h Wed Aug  6 12:22:50 2008
@@ -4,20 +4,19 @@
  * Copyright (C) 2006 Digium, Inc.
  *
  * All rights reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #if !defined(_HPEC_H)

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec_user.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec_user.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec_user.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/hpec/hpec_user.h Wed Aug  6 12:22:50 2008
@@ -4,20 +4,19 @@
  * Copyright (C) 2006 Digium, Inc.
  *
  * All rights reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #if !defined(_HPEC_USER_H)

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/vpm450m.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/vpm450m.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/vpm450m.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/vpm450m.h Wed Aug  6 12:22:50 2008
@@ -5,20 +5,19 @@
  *
  * All Rights Reserved
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _VPM450M_H

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/wct4xxp.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/wct4xxp.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/wct4xxp.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wct4xxp/wct4xxp.h Wed Aug  6 12:22:50 2008
@@ -7,20 +7,19 @@
  *
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #include <linux/ioctl.h>

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakApi.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakApi.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakApi.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakApi.h Wed Aug  6 12:22:50 2008
@@ -16,22 +16,21 @@
  *   11/15/2006  - 24 TDM-TDM Channels EC release
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * permission of Adaptive Digital Technologies, Inc.
+ *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKAPI_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakCust.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakCust.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakCust.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakCust.h Wed Aug  6 12:22:50 2008
@@ -16,22 +16,21 @@
  *   06/15/05 - Initial release.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc. 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKCUST_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakHpi.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakHpi.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakHpi.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/GpakHpi.h Wed Aug  6 12:22:50 2008
@@ -13,22 +13,21 @@
  *   10/17/01 - Initial release.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKHPI_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakErrs.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakErrs.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakErrs.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakErrs.h Wed Aug  6 12:22:50 2008
@@ -15,22 +15,20 @@
  *   06/15/04 - Tone type updates.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKERRS_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakenum.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakenum.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakenum.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/gpakenum.h Wed Aug  6 12:22:50 2008
@@ -13,22 +13,21 @@
  *   06/15/05 - Initial release.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKENUM_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/wctdm24xxp.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/wctdm24xxp.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wctdm24xxp/wctdm24xxp.h Wed Aug  6 12:22:50 2008
@@ -8,20 +8,19 @@
  *
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _WCTDM24XXP_H

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakApi.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakApi.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakApi.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakApi.h Wed Aug  6 12:22:50 2008
@@ -16,22 +16,21 @@
  *   11/15/2006  - 24 TDM-TDM Channels EC release
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * permission of Adaptive Digital Technologies, Inc.
+ *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKAPI_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakErrs.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakErrs.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakErrs.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakErrs.h Wed Aug  6 12:22:50 2008
@@ -15,22 +15,21 @@
  *   06/15/04 - Tone type updates.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKERRS_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakHpi.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakHpi.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakHpi.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/GpakHpi.h Wed Aug  6 12:22:50 2008
@@ -13,22 +13,21 @@
  *   10/17/01 - Initial release.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKHPI_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/gpakenum.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/gpakenum.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/gpakenum.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/gpakenum.h Wed Aug  6 12:22:50 2008
@@ -13,22 +13,21 @@
  *   06/15/05 - Initial release.
  *
  * This program has been released under the terms of the GPL version 2 by
- * permission of Adaptive Digital Technologies, Inc.  The standard
- * GPL disclaimer is given inline below for your convenience.
+ * permission of Adaptive Digital Technologies, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _GPAKENUM_H  /* prevent multiple inclusion */

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/vpmadt032.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/vpmadt032.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/vpmadt032.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/vpmadt032.h Wed Aug  6 12:22:50 2008
@@ -12,20 +12,19 @@
  *
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _VPM150M_H

Modified: linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/wcte12xp.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/wcte12xp.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/wcte12xp.h (original)
+++ linux/team/sruffell/dahdi-transcoder/drivers/dahdi/wcte12xp/wcte12xp.h Wed Aug  6 12:22:50 2008
@@ -12,20 +12,19 @@
  *
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  */
 
 #ifndef _WCTE12XP_H

Modified: linux/team/sruffell/dahdi-transcoder/include/dahdi/user.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-transcoder/include/dahdi/user.h?view=diff&rev=4716&r1=4715&r2=4716
==============================================================================
--- linux/team/sruffell/dahdi-transcoder/include/dahdi/user.h (original)
+++ linux/team/sruffell/dahdi-transcoder/include/dahdi/user.h Wed Aug  6 12:22:50 2008
@@ -442,7 +442,7 @@
 /*
  * Wait for Write to Finish
  */
-#define DAHDI_SYNC			_IOW(DAHDI_CODE, 4, int)
+#define DAHDI_SYNC			_IO(DAHDI_CODE, 4)
 
 /*
  * Get/set channel parameters
@@ -853,12 +853,12 @@
 /*
  * Queue Ping
  */
-#define DAHDI_TIMERPING 		_IOW(DAHDI_CODE, 52, int)
+#define DAHDI_TIMERPING 		_IO(DAHDI_CODE, 52)
 
 /*
  * Acknowledge ping
  */
-#define DAHDI_TIMERPONG 		_IOW(DAHDI_CODE, 53, int)
+#define DAHDI_TIMERPONG 		_IO(DAHDI_CODE, 53)
 
 /*
  * Get/set signalling freeze




More information about the svn-commits mailing list