diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-09-19 18:14:16 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-09-19 18:14:16 +0000 |
| commit | 9c8e1adfac249ee2a4d10e7ae32fc439c22fb8f6 (patch) | |
| tree | 8acc6abb8dc5af8ed5e4bb7a768d112f730ee5b8 | |
| parent | ce199c73e555546aa4c6654695ab90ea42b1970d (diff) | |
Sync with 2.4.0-test9-pre4 kernel.
| -rw-r--r-- | linux/picker.c | 2 | ||||
| -rw-r--r-- | linux/r128_drv.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/linux/picker.c b/linux/picker.c index f8cfe459..6053a947 100644 --- a/linux/picker.c +++ b/linux/picker.c @@ -1,4 +1,4 @@ -#include <linux/autoconf.h> +#include <linux/config.h> #include <linux/version.h> #ifndef CONFIG_SMP diff --git a/linux/r128_drv.h b/linux/r128_drv.h index e0eef6d2..63b98c72 100644 --- a/linux/r128_drv.h +++ b/linux/r128_drv.h @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * Kevin E. Martin <martin@valinux.com> * @@ -197,7 +197,7 @@ extern int r128_context_switch_complete(drm_device_t *dev, int new); #define R128_MAX_USEC_TIMEOUT 100000 /* 100 ms */ -#define R128_BASE(reg) ((unsigned long)(dev_priv->mmio->handle)) +#define R128_BASE(reg) ((u32)(dev_priv->mmio->handle)) #define R128_ADDR(reg) (R128_BASE(reg) + reg) #define R128_DEREF(reg) *(__volatile__ int *)R128_ADDR(reg) |