diff options
Diffstat (limited to 'kernel/include/linux/amba')
| -rw-r--r-- | kernel/include/linux/amba/bus.h | 2 | ||||
| -rw-r--r-- | kernel/include/linux/amba/sp810.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/include/linux/amba/bus.h b/kernel/include/linux/amba/bus.h index 50fc66868..9006c4e75 100644 --- a/kernel/include/linux/amba/bus.h +++ b/kernel/include/linux/amba/bus.h @@ -41,8 +41,6 @@ struct amba_driver { int (*probe)(struct amba_device *, const struct amba_id *); int (*remove)(struct amba_device *); void (*shutdown)(struct amba_device *); - int (*suspend)(struct amba_device *, pm_message_t); - int (*resume)(struct amba_device *); const struct amba_id *id_table; }; diff --git a/kernel/include/linux/amba/sp810.h b/kernel/include/linux/amba/sp810.h index c7df89f99..58fe9e8b6 100644 --- a/kernel/include/linux/amba/sp810.h +++ b/kernel/include/linux/amba/sp810.h @@ -2,7 +2,7 @@ * ARM PrimeXsys System Controller SP810 header file * * Copyright (C) 2009 ST Microelectronics - * Viresh Kumar <viresh.linux@gmail.com> + * Viresh Kumar <vireshk@kernel.org> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any |